Changeset 13374b7 in tol

Timestamp:

Sep 22, 2009, 1:17:36 PM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

4a46d0f

Parents:

55e561e

Message:

Fixes #741

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

File:

• tol/btol/bgrammar/oprimp.cpp (modified) (1 diff)

tol/btol/bgrammar/oprimp.cpp

@@ -1464 +1464 @@
   arguments_ = "";
   BToken* tok = BParser::treToken(dec);
-  while(tok && (tok->TokenType()==BINARY)&&(tok->Name()=="::"))
+  BTokenType type = tok->TokenType();
+  while(tok && (type==BINARY)&&(tok->Name()=="::"))
   {
     dec = Tree::treRight(dec);
     tok = dec?BParser::treToken(dec):NULL;
   }
-  if(tok->TokenType()==TYPE)
-  {
-    dec = dec->cdr();
+  assert(tok->TokenType()==TYPE);
+  dec = dec->cdr();
 //  if(((BToken*)Car((BTree*)Car(dec)))->TokenType()!=TYPE)
-    if(dec &&
-       Tree::treNode(dec) &&
-       (Tree::treNode(dec))->car() &&
-       ((BToken*) (Tree::treNode(dec))->car())->TokenType()!=TYPE) 
-    {
-      dec = Tree::treNode(dec);
-    }
-  }
-  BTokenType type = BParser::treToken(dec)->TokenType();
+  if(dec)
+  {
+    List* auxTre = Tree::treNode(dec);
+    if(auxTre)
+    {
+      BCore* auxCar = auxTre->car();
+      if(auxCar && !auxCar->IsListClass()) 
+      {
+        BToken* auxTok = (BToken*) auxCar; 
+        BTokenType auxType = auxTok->TokenType();
+        if((auxType==FUNCTION) || (auxType==SEPARATOR))
+        {
+          dec = auxTre->cdr();
+        }
+      }
+    }
+  }
+  tok = BParser::treToken(dec);
+  type = tok->TokenType();
   if(allRight)
   {
-    if((type==FUNCTION) || (type==SEPARATOR)) 
-    {
-      dec = dec->cdr();
-    }
     numArg_ = minArg_ = maxArg_ = dec->length();
     lastCalling_.ReallocBuffer(maxArg_);