Imported Upstream version 1.6.0

[platform/upstream/augeas.git] / src / syntax.h

diff --git a/src/syntax.h b/src/syntax.h
index 4c517de..581ac75 100644 (file)
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -1,7 +1,7 @@
 /*
  * syntax.h: Data types to represent language syntax
  *
- * Copyright (C) 2007-2011 David Lutterkort
+ * Copyright (C) 2007-2015 David Lutterkort
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -172,9 +172,6 @@ struct value {
     };
 };
 
-/* Return an exception value with error == 1 (and seen == 1) */
-struct value *exn_error(void);
-
 /* All types except for T_ARROW (functions) are simple. Subtype relations
  * for the simple types:
  *   T_STRING <: T_REGEXP
@@ -232,6 +229,9 @@ struct term *make_app_term(struct term *func, struct term *arg,
                            struct info *info);
 struct term *make_app_ident(char *id, struct term *func, struct info *info);
 
+/* Print a tree in the braces style used in modules */
+void print_tree_braces(FILE *out, int indent, struct tree *tree);
+
 /* Make an EXN value
  * Receive ownership of INFO
  *
@@ -274,7 +274,7 @@ int define_native_intl(const char *fname, int line,
 
 struct module *builtin_init(struct error *);
 
-int load_module_file(struct augeas *aug, const char *filename);
+int load_module_file(struct augeas *aug, const char *filename, const char *name);
 
 /* The name of the builtin function that checks recursive lenses */
 #define LNS_CHECK_REC_NAME "lns_check_rec"