Changeset 1bb52a in git

Timestamp:

Feb 4, 2020, 4:34:41 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2ff629b24aa32f422e13cf36cce6e31941cc61e3

Parents:

a621aa377143a95ae232c9954c821ae2d44cdc3c

Message:

add: iiSetReturn (return without copy)

Location:

Singular

Files:

• grammar.cc (modified) (1 diff)
• grammar.y (modified) (1 diff)
• ipshell.cc (modified) (1 diff)
• ipshell.h (modified) (1 diff)

Singular/grammar.cc

@@ -4187 +4187 @@
 #line 1599 "grammar.y"
     {
-            iiRETURNEXPR.Copy(&(yyvsp[(3) - (4)].lv));
+            iiSetReturn(&(yyvsp[(3) - (4)].lv));
             (yyvsp[(3) - (4)].lv).CleanUp();
             if (exitBuffer(BT_proc)) YYERROR;

Singular/grammar.y

@@ -1598 +1598 @@
         RETURN '(' exprlist ')'
           {
-            iiRETURNEXPR.Copy(&$3);
+            iiSetReturn(&$3);
             $3.CleanUp();
             if (exitBuffer(BT_proc)) YYERROR;

Singular/ipshell.cc

@@ -6604 +6604 @@
   return TRUE;
 }
+
+void iiSetReturn(const leftv source)
+{
+  if ((source->next==NULL)&&(source->e==NULL))
+  {
+    if ((source->rtyp!=IDHDL)&&(source->rtyp!=ALIAS_CMD))
+    {
+      memcpy(&iiRETURNEXPR,source,sizeof(sleftv));
+      source->Init();
+      return;
+    }
+    if (source->rtyp==IDHDL)
+    {
+      if ((IDLEV((idhdl)source->data)==myynest)
+      &&(IDTYP((idhdl)source->data)!=RING_CMD))
+      {
+        memset(&iiRETURNEXPR,0,sizeof(sleftv));
+        iiRETURNEXPR.rtyp=IDTYP((idhdl)source->data);
+        iiRETURNEXPR.data=IDDATA((idhdl)source->data);
+        iiRETURNEXPR.flag=IDFLAG((idhdl)source->data);
+        iiRETURNEXPR.attribute=IDATTR((idhdl)source->data);
+        IDATTR((idhdl)source->data)=NULL;
+        IDDATA((idhdl)source->data)=NULL;
+        source->name=NULL;
+        source->attribute=NULL;
+        return;
+      }
+    }
+  }
+  iiRETURNEXPR.Copy(source);
+}

Singular/ipshell.h

@@ -300 +300 @@
 BOOLEAN rDecompose_CF(leftv res,const coeffs C);
 ring rCompose(const lists  L, const BOOLEAN check_comp=TRUE, const long bitmask=0x7fff, const int isLetterplace=FALSE);
+
+void iiSetReturn(const leftv h);
 #endif