Shortened pattern ids for macro syntax

diff --git a/example.dl b/example.dl
index fd9736b20c459a2e2ed75e8c69565e178c8284fa..f2d5b554c58eeadd92b6afe84926b1c7e10faf12 100644 (file)
--- a/example.dl
+++ b/example.dl
@@ -52,8 +52,8 @@ foo = ({|a,b| a + b })(1,2)
 #------------------------------------------------------------------------------
 
 % if [
-    (Expression Block Block) : exec_if($1, $2, $3),
-    (Expression Block) : exec_if($1, $2)
+    (E B B) : exec_if($1, $2, $3),
+    (E B)   : exec_if($1, $2)
 ]
 
 if (1==1)
@@ -73,11 +73,11 @@ if (1 == 1)
 #------------------------------------------------------------------------------
 
 % delay [
-    (Expression) : make_promise({ $1 })
+    (E) : make_promise({ $1 })
 ]
 
 % force [
-    (Expression) : $1()
+    (E) : $1()
 ]
 
 foo = delay 1 + 1

diff --git a/source/dlparser/dlparser.cpp b/source/dlparser/dlparser.cpp
index 2a1e80688b805263b9b3d6ba97512a0938af9088..cff64172b4f22277057255188672838b6ef93e74 100644 (file)
--- a/source/dlparser/dlparser.cpp
+++ b/source/dlparser/dlparser.cpp
@@ -6,16 +6,16 @@ using namespace std;
 
 DLParser::DLParser() : BTParser()
 {
-    pattern_types.insert( pair<string,PatternType_T>( "Map", MAP_TYP ));
-    pattern_types.insert( pair<string,PatternType_T>( "Vector", VECT_TYP ));
-    pattern_types.insert( pair<string,PatternType_T>( "List", LIST_TYP ));
-    pattern_types.insert( pair<string,PatternType_T>( "Block", BLK_TYP ));
-    pattern_types.insert( pair<string,PatternType_T>( "Id", ID_TYP ));
-    pattern_types.insert( pair<string,PatternType_T>( "Num", NUM_TYP ));
-    pattern_types.insert( pair<string,PatternType_T>( "Char", CHAR_TYP ));
-    pattern_types.insert( pair<string,PatternType_T>( "String", STR_TYP ));
-    pattern_types.insert( pair<string,PatternType_T>( "Symbol", SYM_TYP ));
-    pattern_types.insert( pair<string,PatternType_T>( "Expression", EXPR_TYP ));
+    pattern_types.insert( pair<string,PatternType_T>( "M", MAP_TYP ));
+    pattern_types.insert( pair<string,PatternType_T>( "V", VECT_TYP ));
+    pattern_types.insert( pair<string,PatternType_T>( "L", LIST_TYP ));
+    pattern_types.insert( pair<string,PatternType_T>( "B", BLK_TYP ));
+    pattern_types.insert( pair<string,PatternType_T>( "I", ID_TYP ));
+    pattern_types.insert( pair<string,PatternType_T>( "N", NUM_TYP ));
+    pattern_types.insert( pair<string,PatternType_T>( "C", CHAR_TYP ));
+    pattern_types.insert( pair<string,PatternType_T>( "St", STR_TYP ));
+    pattern_types.insert( pair<string,PatternType_T>( "Sy", SYM_TYP ));
+    pattern_types.insert( pair<string,PatternType_T>( "E", EXPR_TYP ));
 }
 
 DLParser::~DLParser()