Changeset 4427439 in tol

Timestamp:

Jan 17, 2011, 8:52:00 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

11e604b

Parents:

6a96b5f

Message:

Fixes #881
BUserFunction creates its own BUserFunCode

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

Location:

tol/btol

Files:

• bgrammar/spfuninst.cpp (modified) (1 diff)
• code_type/codgra.cpp (modified) (1 diff)
• code_type/tol_bcodgra.h (modified) (1 diff)
• set_type/setgra.cpp (modified) (1 diff)

tol/btol/bgrammar/spfuninst.cpp

@@ -1093 +1093 @@
 {
   static BText _name_ = "Copy";
-    BSyntaxObject* result = NIL;
-    BInt nb = BSpecialFunction::NumBranches(tre);
-    if(BSpecialFunction::TestNumArg(_name_, 1, nb, 1))
-    {
-        BSyntaxObject* toCopy = gra->EvaluateTree(Branch(tre,1));
-        if(toCopy)
-        {
+  BSyntaxObject* result = NIL;
+  BInt nb = BSpecialFunction::NumBranches(tre);
+  if(BSpecialFunction::TestNumArg(_name_, 1, nb, 1))
+  {
+    BGrammar::IncLevel();
+    int stackPos = BGrammar::StackSize();
+    BSyntaxObject* toCopy = gra->EvaluateTree(Branch(tre,1));
+          if(toCopy)
+          {
             result = toCopy->CopyContens();
-            if(result!=toCopy)
-            {
-                SAFE_DESTROY(toCopy,result);
-            }
-        }
-    }
-    result=BSpecialFunction::TestResult(_name_,result,tre,NIL,BTRUE);
-    return(result);
+          }
+    BGrammar::DestroyStackUntil(stackPos, result);    
+    BGrammar::DecLevel();
+  }
+  result=BSpecialFunction::TestResult(_name_,result,tre,NIL,BTRUE);
+  return(result);
 }
 

tol/btol/code_type/codgra.cpp

@@ -47 +47 @@
 { 
   Contens(); 
+}
+
+//--------------------------------------------------------------------
+  BUserFunCode::BUserFunCode()
+//--------------------------------------------------------------------
+: BContensCode() 
+{
 }
 

tol/btol/code_type/tol_bcodgra.h

@@ -47 +47 @@
 {
 public:
+  BUserFunCode();
   BUserFunCode(const BText& name, const BCode& aCode, const BText& desc);
   BUserFunCode(const BText& name, BStandardOperator* opr, const BText& desc);

tol/btol/set_type/setgra.cpp

@@ -2265 +2265 @@
 BSyntaxObject* CopyCode(BSyntaxObject* obj)
 {
-  BCode cod;
-  cod.Replicate(Code(obj));
-  return(new BContensCode("",cod,""));
+  BCode& cod = Code(obj);
+  BUserFunction* opr = (BUserFunction*)cod.Operator();
+  if(opr)
+  {
+    BUserFunction* usf = new BUserFunction("",opr->Grammar());
+    BUserFunCode* result = usf->GetCode();
+    usf->PutName(opr->Name());
+    usf->PutDescription(opr->Description());
+    usf->SetExpression(opr->Declaration(), opr->Definition()); 
+    result->PutName(opr->Name());
+    result->PutDescription(opr->Description());
+    return(result);
+  }
+  else
+  {
+    Error(BText("Cannot copy Code ")<<obj->Identify());
+    return(NULL);
+  }
 };
 /*