Changeset 589249e in tol

Timestamp:

Apr 3, 2009, 5:27:39 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

e0792b1

Parents:

299cfe9

Message:

Fixes #674

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

Location:

tol

Files:

• bparser/par.cpp (modified) (1 diff)
• btol/bgrammar/class.cpp (modified) (1 diff)
• btol/bgrammar/graimp.cpp (modified) (3 diffs)
• btol/bgrammar/nameblock.cpp (modified) (2 diffs)
• btol/bgrammar/oprimp.cpp (modified) (3 diffs)

tol/bparser/par.cpp

@@ -894 +894 @@
   else 
   {
-
     if(NextSymbol()->Name()==";")
     { 

tol/btol/bgrammar/class.cpp

@@ -80 +80 @@
     if(expression[0]=='[')
     {
-      expression = expression.SubString(2,expression.Length()-4);
+      expression = expression.SubString(2,expression.Length()-3);
     }
     else if(expression[0]=='{')

tol/btol/bgrammar/graimp.cpp

@@ -540 +540 @@
 //--------------------------------------------------------------------
 {
+  static BEqualOperator* BNameBlock_BEqualOperator = 
+    (BEqualOperator*)GraNameBlock()->FindOperator("=");
   static BText none;
   eval_depth_t eval_depth_helper;
   bool error = false;
   BGrammar* newGrammar = NIL;
+  BClass* newClass = NIL;
   BBool enableCasting=BTRUE;
   bool isCreatingNameBlock = BEqualOperator::IsCreatingNameBlock();
@@ -574 +577 @@
   int stackPos = -1;
 
-  if((this==GraNameBlock()) && (name=="SetOfAnything"))
+  if((this==GraNameBlock()) && 
+    ((name=="SetOfAnything")||(name=="#DefaultInstance")))
   {
     return(BNameBlock::EvaluateTree(tre));
@@ -669 +673 @@
     } 
   }
+  else if((type == TYPE) && (newClass=FindClass(name)))
+  {
+    result = BNameBlock_BEqualOperator->Evaluate(tre);
+  }
   else if (type == BINARY && this == GraAnything() && 
            name != "=" && name != "#F#" && 

tol/btol/bgrammar/nameblock.cpp

@@ -261 +261 @@
 {
   int n;
+  BToken* tok = (BToken*)_tre->car();
+  bool isDefaultInstance = tok->Name()=="#DefaultInstance";
   BText name  = BEqualOperator::CreatingName();
   BText fullName = BEqualOperator::CurrentFullName();
@@ -316 +318 @@
     else
     {
-      List* tre = _tre->duplicate();
+      List* tre = NULL;
+      if(!isDefaultInstance) { tre = _tre->duplicate(); }
       newNameBlock.PutTree(tre);
+      newNameBlock.CreateParentHashes();
+      newNameBlock.CreateMemberHashes();
       newNameBlock.AddParent((BClass*)cls);
-      newNameBlock.AddMemberList(tre->cdr());
+      if(!isDefaultInstance) { 
+      //Std(BText("BNameBlock::EvaluateTree:\n")+BParser::treWrite((List*)tre,"  "));
+        newNameBlock.AddMemberList(tre->cdr());
+      }
       newNameBlock.SortMembers();
       int stackPos = BGrammar::StackSize();
-
 
       if(newNameBlock.isGood_ && newNameBlock.mbrDecHash_->size())

tol/btol/bgrammar/oprimp.cpp

@@ -811 +811 @@
   BStruct* str = NULL;
   BClass*  cls = NULL;
-  BGrammar* gra = GetLeft(Grammar(),
-                          Tree::treNode((List*) argList),
-                          name, rest, str, cls);
+
+  bool carIsList = argList->car()->IsListClass();
+  List* dec = carIsList?Tree::treNode((List*) argList):(List*)argList;
+  BGrammar* gra = GetLeft(Grammar(), dec, name, rest, str, cls);
+  List* left = NULL;
+  bool defInst = false;
+  if(!carIsList && cls && !rest)
+  {
+    defInst = true; 
+    BToken* tok = new BToken("#DefaultInstance",ARGUMENT);
+    left = new List(tok, NIL);
+  }
+  else
+  {
+    left = Tree::treLeft((List*)argList);
+  } 
   creatingClass_ = NULL;
   bool oldIsCreatingNameBlock = isCreatingNameBlock_;
@@ -840 +853 @@
   if(!rest && gra) 
   {
-          result = CreateObject(Tree::treLeft((List*)argList), gra, name);
+    if(defInst)
+    {
+            result = CreateObject(left, gra, name);
+    }
+    else
+    {
+            result = CreateObject(left, gra, name);
+    }
     if(str && result)
     {
@@ -871 +891 @@
     creatingClass_   = oldClass;
     isCreatingNameBlock_ = oldIsCreatingNameBlock;
+  }
+  if(defInst)
+  {
+    DESTROY(left);
   }
   return(result);