X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/f640bcb3ba82576ec131c564f2b347e2f3accdd3..9417e1a3cc1e271731a15af771234f92da8d2646:/lib/macros.h

diff --git a/lib/macros.h b/lib/macros.h
index aa20f2d..d908fca 100644
--- a/lib/macros.h
+++ b/lib/macros.h
@@ -2,20 +2,18 @@
  * This file is part of DisOrder
  * Copyright (C) 2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 /** @file lib/macros.h
@@ -42,10 +40,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 +93,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 report);
 
 int mx_expand_file(const char *path,
                    struct sink *output,
@@ -110,10 +114,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 */