Renamed macro variables to syntax to reflect new nomenclature

diff --git a/source/dlparser/dlparser.cpp b/source/dlparser/dlparser.cpp
index bdea06cdb781c8a2fc47e7f5e783732286965856..de53187e489f17448530f88bfd4117665f392fdc 100644 (file)
--- a/source/dlparser/dlparser.cpp
+++ b/source/dlparser/dlparser.cpp
@@ -21,9 +21,9 @@ DLParser::~DLParser()
 {
 }
 
-bool DLParser::isMacroName(void)
+bool DLParser::isSyntaxName(void)
 {
-    return (macros.count( lookaheadToken(1).text() ) > 0);
+    return (syntaxes.count( lookaheadToken(1).text() ) > 0);
 }
 
 bool DLParser::isCoreFormName(void)
@@ -73,7 +73,7 @@ AST* DLParser::Expression(void)
     }
 
     // Register any new syntaxes and expand any existing syntax uses
-    ExpProcessor processor( macros );
+    ExpProcessor processor( syntaxes );
     processor.visit( ret );
 
     return ret;
@@ -166,7 +166,7 @@ AST* DLParser::BasicExp(void)
     AST* ret = NULL;
 
     // Macro Expression
-    if ( isMacroName() )
+    if ( isSyntaxName() )
     {
         // Save current terminator
 

diff --git a/source/dlparser/dlparser.h b/source/dlparser/dlparser.h
index 0b48ee7358cf6988cf90029fec5bbf6a15316bfd..e18e487a23040af07bce872dee84ab9e6db4d0c2 100644 (file)
--- a/source/dlparser/dlparser.h
+++ b/source/dlparser/dlparser.h
@@ -10,11 +10,11 @@ class DLParser : public BTParser
 {
     private:
         std::map<std::string,eTokenTypes> core_forms;
-        std::map<std::string,Syntax*> macros;
+        std::map<std::string,Syntax*> syntaxes;
     public:
         DLParser();
         ~DLParser();
-        bool isMacroName(void);
+        bool isSyntaxName(void);
         bool isCoreFormName(void);
         eTokenTypes getCoreFormId(void);
         void parse(void);

diff --git a/source/visitors/expprocessor.cpp b/source/visitors/expprocessor.cpp
index 78eb6c3ec82be547d286ae6607c8afd3d4508dd5..91decf374613be59b5383fc008cca0a16fa8c276 100644 (file)
--- a/source/visitors/expprocessor.cpp
+++ b/source/visitors/expprocessor.cpp
@@ -1,6 +1,6 @@
 #include "expprocessor.h"
 
-ExpProcessor::ExpProcessor(std::map<std::string,Syntax*> &macros) : macro_registry(macros)
+ExpProcessor::ExpProcessor(std::map<std::string,Syntax*> &syntaxes) : syntax_registry(syntaxes)
 {
 }
 
@@ -27,9 +27,9 @@ void ExpProcessor::afterChildren(AST* cur, int depth)
     if (cur->type() == SYNTAX)
     {
         std::string name = (*(cur->children()->begin()))->text();
-        Syntax* macro = new Syntax();
-        macro->name( name );
-        macro_registry[ macro->name() ] = macro;
+        Syntax* syntax = new Syntax();
+        syntax->name( name );
+        syntax_registry[ syntax->name() ] = syntax;
     }
 }
 

diff --git a/source/visitors/expprocessor.h b/source/visitors/expprocessor.h
index 0c0b2f20bdd02c123bc95236d9ce84867feba227..b8478fa30366eae9532e9c833297fbec0ab54323 100644 (file)
--- a/source/visitors/expprocessor.h
+++ b/source/visitors/expprocessor.h
@@ -8,9 +8,9 @@
 
 class ExpProcessor : public IVisitor {
     protected:
-        std::map<std::string,Syntax*>& macro_registry;
+        std::map<std::string,Syntax*>& syntax_registry;
     public:
-        ExpProcessor(std::map<std::string,Syntax*>& macros);
+        ExpProcessor(std::map<std::string,Syntax*>& syntaxes);
     private:
         void beforeVisit(AST* cur, int depth);
         void afterVisit(AST* cur, int depth);