Changeset e46a3ec in tol

Timestamp:

Sep 18, 2009, 9:24:04 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

3c7ad1f

Parents:

340ba59

Message:

New optional macro _TRACE_CURRENT_NEXTARGUMENT_

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@1407 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/bparser/scn.cpp (modified) (4 diffs)

tol/bparser/scn.cpp

@@ -36 +36 @@
 BScanner::BTokenByNameHash BScanner::aliasTable_;
 BScanner::BTokenByNameHash BScanner::usrDefSymbol_; //!< User defined symbols Class, Struct, ...
+BScanner* BScanner::current_ = NULL;
 
 
@@ -98 +99 @@
 }
 
+#define _USE_TRACE_CURRENT_NEXTARGUMENT_
+
+//--------------------------------------------------------------------
+static void _trace_current_nextArgument_(
+  const char* function, 
+  int itemNum)
+//--------------------------------------------------------------------
+{
+  if(BScanner::GetCurrent())
+  {
+    Std(BText("\n _TRACE_CURRENT_NEXTARGUMENT_(")+function+","+itemNum+") "
+        " -> '"+BScanner::GetCurrent()->NextArgument()+"'\n");
+  }
+}
+
+#ifdef _USE_TRACE_CURRENT_NEXTARGUMENT_
+#define _TRACE_CURRENT_NEXTARGUMENT_(function,itemNum) \
+        _trace_current_nextArgument_(function,itemNum)
+#else
+#define _TRACE_CURRENT_NEXTARGUMENT_(function,itemNum) 
+#endif
 
 //--------------------------------------------------------------------
@@ -110 +132 @@
 //--------------------------------------------------------------------
 {
+  _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",1);
+  if(!name.HasName()) { return(NULL); }
   BToken* tok = NULL;
+  _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",2);
   BTokenByNameHash::const_iterator found;
+  _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",3);
   found = symbolTable_.find(name);
+  _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",4);
   if(found==symbolTable_.end()) 
   { 
+    _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",5);
     found = aliasTable_.find(name);
+    _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",6);
     if(found!=aliasTable_.end()) 
     { 
+      _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",7);
       tok = found->second; 
+      _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",8);
     }
+    _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",9);
   }
   else 
   { 
+    _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",10);
     tok = found->second; 
+    _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",11);
   }           
+  _TRACE_CURRENT_NEXTARGUMENT_("FindSymbol",12);
   return(tok);
 }
@@ -447 +482 @@
   nextArgument_ = "";
   structDefininig_ = false;
+  current_ = this;
 }