document new choose screen properly

[disorder] / lib / macros.h

diff --git a/lib/macros.h b/lib/macros.h
index aa20f2db179f091e67d38874f1e708155e29e49b..772873c44d5ba68567c435539da99a551ef5fcef 100644 (file)
--- a/lib/macros.h
+++ b/lib/macros.h
@@ -42,10 +42,10 @@ struct mx_node {
   int line;
   
   /** @brief Plain text (if @p type is @ref MX_TEXT) */
-  char *text;
+  const char *text;
 
   /** @brief Expansion name (if @p type is @ref MX_EXPANSION) */
-  char *name;
+  const char *name;
 
   /** @brief Argument count (if @p type is @ref MX_EXPANSION) */
   int nargs;
@@ -95,12 +95,18 @@ void mx_register(const char *name,
                  int min,
                  int max,
                  mx_simple_callback *callback);
-void mx_magic_register(const char *name,
+void mx_register_magic(const char *name,
                        int min,
                        int max,
                        mx_magic_callback *callback);
+int mx_register_macro(const char *name,
+                      int nargs,
+                      char **args,
+                      const struct mx_node *definition);
 
 void mx_register_builtin(void);
+void mx_search_path(const char *s);
+char *mx_find(const char *name);
 
 int mx_expand_file(const char *path,
                    struct sink *output,
@@ -110,10 +116,16 @@ int mx_expand(const struct mx_node *m,
               void *u);
 int mx_expandstr(const struct mx_node *m,
                  char **sp,
-                 void *u);
+                 void *u,
+                 const char *what);
+const struct mx_node *mx_rewrite(const struct mx_node *definition,
+                                 hash *h);
+const struct mx_node *mx_rewritel(const struct mx_node *m,
+                                  ...);
 
 int mx_str2bool(const char *s);
 const char *mx_bool2str(int n);
+int mx_bool_result(struct sink *output, int result);
 
 #endif /* MACROS_H */