Changeset 3d1e16b in tol

Timestamp:

Apr 8, 2009, 6:28:46 PM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

11f3712

Parents:

664a9aa

Message:

Allowing member types (with ::) into a Class

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

File:

• tol/btol/bgrammar/class.cpp (modified) (4 diffs)

tol/btol/bgrammar/class.cpp

@@ -138 +138 @@
     isMethod_ = tok->TokenType()==FUNCTION;
   }
+  else if((tok->TokenType()==BINARY)&&(tok->Name()=="::"))
+  {
+    declaration_ = BParser::Unparse(branch,"","");
+    BText simpleDec = declaration_;
+    isMethod_ = simpleDec.Find('(')>=0;
+    simpleDec.Replace("("," ");
+    simpleDec.Compact();
+    int p0 = simpleDec.Find(' ');
+    if(p0>0)
+    {
+      int p1 = simpleDec.Find(' ', p0+1);
+      if(p1<0) { p1 = simpleDec.Length()+1; }
+      if(p0+1<p1-1)
+      {
+        name_ = simpleDec.SubString(p0+1,p1-1);
+      }
+    }
+  } 
   //Cleaning open and close parenthesis
   if(declaration_[0]=='{')
@@ -530 +548 @@
     {
       //If it had default value then is replaced by new one
+    //newMbrNum->position_ = mbrNum->position_;
       memberHash_->erase(name);
       assert(!FindMember(name));
@@ -540 +559 @@
     {
       //If it had no default value then is added the new one
+    //newMbrNum->position_ = mbrNum->position_;
       memberHash_->erase(name);
       assert(!FindMember(name));
@@ -906 +926 @@
       if(!result)
       {
-        cns = cns->Father(); 
+      //cns = cns->Father(); 
+        cns = NULL;
       }
     }