3 files changed, 10 insertions, 1 deletions
diff --git a/src/include/syntax.h b/src/include/syntax.h
index b4410c5..777fea4 100644
--- a/src/include/syntax.h
+++ b/src/include/syntax.h
@@ -14,11 +14,14 @@
 #define SYNTAX_APPLY             '.'
 #define SYNTAX_LIST_DELIM        ','
 #define SYNTAX_TAG_DELIM         ':'
-#define SYNTAX_NAMESPACE_DELIM   '/'
+#define SYNTAX_NAMESPACE_DELIM   '!'
 #define SYNTAX_LBLOCK            '{'
 #define SYNTAX_RBLOCK            '}'
 #define SYNTAX_RLIST             '['
 #define SYNTAX_LLIST             ']'
 #define SYNTAX_ESC               '\\'
 
+/* characters that can appear in keywords */
+#define SYNTAX_KWD_CHARS         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_~|&+-/*<>=%^$@?"
+
 #endif
diff --git a/src/include/token.h b/src/include/token.h
index 129ed76..9e64c97 100644
--- a/src/include/token.h
+++ b/src/include/token.h
@@ -24,6 +24,7 @@ typedef struct TOKEN_STRUC {
       TOKEN_RLIST,
       TOKEN_LLIST,
       TOKEN_ESC,
+      TOKEN_KWD,
       TOKEN_INT
    } type;
 
diff --git a/src/include/tree.h b/src/include/tree.h
index a240a18..108f646 100644
--- a/src/include/tree.h
+++ b/src/include/tree.h
@@ -27,6 +27,11 @@ typedef struct TREE_T_STRUCT {
          arg_t* arg;
          struct TREE_T_STRUCT* val;
       } tree_def;
+
+      struct {
+         char* id;
+         arg_t* arg;
+      } tree_cal;
    } data;
 } tree_t;