Changeset cd4fb36 in tol

Timestamp:

Jul 13, 2009, 9:36:28 AM (17 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

945a0e9

Parents:

ed0b2a8

Message:

Enabling both expressions

<class name> <class expression>

and decalration

<class name> <new class instance name>

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

File:

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

tol/btol/bgrammar/graimp.cpp

@@ -718 +718 @@
   else if((type == TYPE) && (newClass=FindClass(name)))
   {
-    result = GraNameBlock()->EvaluateTree(Tree::treLeft((List*)tre));
+    List* left = Tree::treLeft((List*)tre);
+    if(left)
+    {
+      BToken* leftTok  = BParser::treToken(left);
+      if(leftTok && (leftTok->TokenType()!=ARGUMENT))
+      { 
+        result = GraNameBlock()->EvaluateTree(Tree::treLeft((List*)tre));
+      }
+    }
+    if(!result)
+    {
+      result = BNameBlock_BEqualOperator->Evaluate(tre); 
+    }
   }
   else if (type == BINARY && this == GraAnything() &&