Changeset a3e6543 in tol

Timestamp:

Sep 22, 2009, 10:06:13 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

83f123c

Parents:

ff0786f

Message:

Fixes #747

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

File:

• tol/bparser/par.cpp (modified) (6 diffs)

tol/bparser/par.cpp

@@ -950 +950 @@
 Tree* BParser::ParseSeparator (Tree* tre) 
 {
-  tre  = ParseDelayed (tre);
   bool lastWasEmbed = lastSymbol_ && (lastSymbol_->Name()=="#Embed");
   bool lastWasClass = lastSymbol_ && (lastSymbol_->Name()=="Class");
-
+  if(!lastWasClass && (lastSymbol_==delayedSymbol_) &&
+      lastSymbol_2_ && (lastSymbol_2_->Name()=="Class"))
+  {
+    lastWasClass = true;
+  }
+  bool neededToParseDelayed = true;
   if(lastWasClass && !NextArgument() && delayedSymbol_ &&
       (delayedSymbol_->TokenType()==TYPE))
@@ -963 +967 @@
       delayedSymbol_ = NULL;
     } 
+  }
+  if(neededToParseDelayed)
+  {
+    tre = ParseDelayed(tre);
   }
 
@@ -1255 +1263 @@
 }
 
+//#define ENABLE_SYMBOL_TRACE
+
 //--------------------------------------------------------------------
 BBool BParser::ReadNextSymbol(BTokenType& symbolType) 
@@ -1270 +1280 @@
     classFound  = (sym=="Class");
   }
-//  if(scan_->NextSymbol())
-/* * /
+#ifdef ENABLE_SYMBOL_TRACE
   if(lastSymbol_)
   {
@@ -1281 +1290 @@
     Std(BText("\n  Parser[")+(int)this+"] lastSymbol_ <- ''");
   }
-/* */
+  if(delayedSymbol_)
+  {
+    Std(BText("\n  Parser[")+(int)this+"] delayedSymbol_ <- '"+
+      delayedSymbol_->Name()+"'");
+  }
+#endif
   symbolType = scan_->ReadNextSymbol();
-/* * /
-
+#ifdef ENABLE_SYMBOL_TRACE
   Std(BText("\n  Parser[")+(int)this+"] symbolType <- '"+TokenTypeName(symbolType));
   if(scan_->NextSymbol())
@@ -1301 +1314 @@
       " complete = "+(int)complete_);
   }
-/* */
+#endif
   if((symbolType==ARGUMENT) ||
      ((scan_->NextArgument()!="") && complete_))