Changeset ea947e in git

Timestamp:

Jul 1, 2010, 11:44:31 AM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b157872a7e82b6661c4a809febe9ccf834773646

Parents:

5dfa8c02eb88c8d20f6bba3eef61f4d4a24718ee

Message:

alias, variant 1

git-svn-id: file:///usr/local/Singular/svn/trunk@12936 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• grammar.cc (modified) (2 diffs)
• grammar.y (modified) (1 diff)
• ipassign.cc (modified) (1 diff)
• ipid.cc (modified) (2 diffs)
• iplib.cc (modified) (1 diff)
• ipshell.cc (modified) (3 diffs)
• ipshell.h (modified) (1 diff)
• subexpr.cc (modified) (5 diffs)

Singular/grammar.cc

@@ -3868 +3868 @@
 #line 1595 "grammar.y"
     {
-            //Print("par:%s, %d\n",$2.Name(),$2.Typ());
-            //yylineno--;
-            if (iiParameter(&(yyvsp[(2) - (2)].lv))) YYERROR;
+            // decl. of type proc p(int i)
+            if ((yyvsp[(1) - (2)].i)==PARAMETER)  { if (iiParameter(&(yyvsp[(2) - (2)].lv))) YYERROR; }
+            else                { if (iiAlias(&(yyvsp[(2) - (2)].lv))) YYERROR; } 
           ;}
     break;
@@ -3877 +3877 @@
 #line 1601 "grammar.y"
     {
-            //Print("par:%s, %d\n",$2.Name(),$2.Typ());
+            // decl. of type proc p(i)
             sleftv tmp_expr;
-            //yylineno--;
+            if ((yyvsp[(1) - (2)].i)==ALIAS_CMD) MYYERROR("alias requires a type");
             if ((iiDeclCommand(&tmp_expr,&(yyvsp[(2) - (2)].lv),myynest,DEF_CMD,&IDROOT))
             || (iiParameter(&tmp_expr)))

Singular/grammar.y

@@ -1594 +1594 @@
         PARAMETER declare_ip_variable
           {
-            //Print("par:%s, %d\n",$2.Name(),$2.Typ());
-            //yylineno--;
-            if (iiParameter(&$2)) YYERROR;
+            // decl. of type proc p(int i)
+            if ($1==PARAMETER)  { if (iiParameter(&$2)) YYERROR; }
+            else                { if (iiAlias(&$2)) YYERROR; } 
           }
         | PARAMETER expr
           {
-            //Print("par:%s, %d\n",$2.Name(),$2.Typ());
+            // decl. of type proc p(i)
             sleftv tmp_expr;
-            //yylineno--;
+            if ($1==ALIAS_CMD) MYYERROR("alias requires a type");
             if ((iiDeclCommand(&tmp_expr,&$2,myynest,DEF_CMD,&IDROOT))
             || (iiParameter(&tmp_expr)))

Singular/ipassign.cc

@@ -1323 +1323 @@
   int rt=NONE;
   BOOLEAN b;
+  if (l->rtyp==ALIAS_CMD)
+  {
+    Werror("`%s` is read-only",l->Name());
+  }
 
   if(l->attribute!=NULL)

Singular/ipid.cc

@@ -152 +152 @@
         break;
       case STRING_CMD:
-        IDSTRING(h) = omStrDup("");
+        len=1;
         break;
       case LIST_CMD:
@@ -465 +465 @@
   }
 #ifdef TEST
-  else if ((IDTYP(h)!= INT_CMD)&&(IDTYP(h)!=DEF_CMD) && (IDTYP(h)!=NONE))
+  else if ((IDTYP(h)!= INT_CMD)
+  &&(IDTYP(h)!=DEF_CMD) 
+  &&(IDTYP(h)!=ALIAS_CMD) 
+  &&(IDTYP(h)!=NONE))
     Warn("unknown type to kill: %s(%d)",Tok2Cmdname(IDTYP(h)),IDTYP(h));
 #endif

Singular/iplib.cc

@@ -162 +162 @@
       }
       // copy the result to argstr
-      strcat(argstr,"parameter ");
+      if(strncmp(s,"alias ",6)!=0)
+      {
+        strcat(argstr,"parameter ");
+      }
       strcat(argstr,s);
       strcat(argstr,"; ");

Singular/ipshell.cc

@@ -383 +383 @@
       {
         if (iterate) list1(prefix,h,TRUE,fullname);
+        if (IDTYP(h)==ALIAS_CMD) PrintS("A");
         if ((IDTYP(h)==RING_CMD)
             || (IDTYP(h)==QRING_CMD)
@@ -1143 +1144 @@
   omFreeBin((ADDRESS)h, sleftv_bin);
   return res;
+}
+BOOLEAN iiAlias(leftv p)
+{
+  if (iiCurrArgs==NULL)
+  {
+    Werror("not enough arguments for proc %s",VoiceName());
+    p->CleanUp();
+    return TRUE;
+  }
+  leftv h=iiCurrArgs;
+  iiCurrArgs=h->next;
+  h->next=NULL;
+  if (h->rtyp!=IDHDL)
+  {
+    WerrorS("identifier required");
+    return TRUE;
+  }
+  if (h->Typ()!=p->Typ())
+  {
+    WerrorS("type mismatch");
+    return TRUE;
+  }
+  idhdl pp=(idhdl)p->data;
+  switch(pp->typ)
+  {
+      case INT_CMD:
+        break;
+      case INTVEC_CMD:
+      case INTMAT_CMD:
+         delete IDINTVEC(pp);
+         break;
+      case NUMBER_CMD:
+         nDelete(&IDNUMBER(pp));
+         break;
+      case BIGINT_CMD:
+         nlDelete(&IDNUMBER(pp),currRing);
+         break;
+      case MAP_CMD:
+         {
+           map im = IDMAP(pp);
+           omFree((ADDRESS)im->preimage);
+         }
+         // continue as ideal:
+      case IDEAL_CMD:
+      case MODUL_CMD:
+      case MATRIX_CMD:
+          idDelete(&IDIDEAL(pp));
+         break;
+      case PROC_CMD:
+      case RESOLUTION_CMD:
+      case STRING_CMD:
+         omFree((ADDRESS)IDSTRING(pp));
+         break;
+      case LIST_CMD:
+         IDLIST(pp)->Clean();
+         break;
+      case LINK_CMD:
+         omFreeBin(IDLINK(pp),sip_link_bin);
+         break;
+       // case ring: cannot happen
+       default:
+         Werror("unknown type %d",p->Typ());
+         return TRUE;
+  }
+  pp->typ=ALIAS_CMD;
+  IDDATA(pp)=(char*)h->data;
+  h->CleanUp();
+  omFreeBin((ADDRESS)h, sleftv_bin);
+  return FALSE;
 }
 
@@ -4420 +4490 @@
             R->block1[n] = last;
             //if ((R->block0[n]>R->block1[n])
-            //|| (R->block1[n]>rVar(R)))
-            //{
-            //  R->block1[n]=rVar(R);
-            //  //WerrorS("ordering larger than number of variables");
-            //  break;
-            //}
+            //|| (R->block1[n]>rVar(R)))
+            //{
+            //  R->block1[n]=rVar(R);
+            //  //WerrorS("ordering larger than number of variables");
+            //  break;
+            //}
             if (rCheckIV(iv)) return TRUE;
             for(i=si_min(rVar(R),R->block1[n]);i>=R->block0[n];i--)

Singular/ipshell.h

@@ -168 +168 @@
 
 BOOLEAN iiParameter(leftv p);
+BOOLEAN iiAlias(leftv p);
 /* ================================================================== */
 int     iiDeclCommand(leftv sy, leftv name, int lev, int t, idhdl* root,

Singular/subexpr.cc

@@ -281 +281 @@
 void sleftv::CleanUp(ring r)
 {
-  if ((name!=NULL) && (name!=sNoName) && (rtyp!=IDHDL))
+  if ((name!=NULL) && (name!=sNoName) && (rtyp!=IDHDL) && (rtyp!=ALIAS_CMD))
   {
     //::Print("free %x (%s)\n",name,name);
@@ -830 +830 @@
     switch (rtyp)
     {
+      case ALIAS_CMD:
+         {
+           idhdl h=(idhdl)data;
+           return  ((idhdl)h->data.ustring)->typ;
+         }
       case IDHDL:
         return IDTYP((idhdl)data);
@@ -860 +865 @@
   int r=0;
   int t=rtyp;
-  if (t==IDHDL) t=IDTYP((idhdl)data);
+  if (t==ALIAS_CMD) { idhdl h=(idhdl)IDDATA((idhdl)data); t=IDTYP(h); }
+  else if (t==IDHDL) t=IDTYP((idhdl)data);
   switch (t)
   {
@@ -950 +956 @@
 void * sleftv::Data()
 {
+  if(rtyp==ALIAS_CMD)
+  {
+    idhdl h=(idhdl)data;
+    return  ((idhdl)h->data.ustring)->data.ustring;
+  }
   if ((rtyp!=IDHDL) && iiCheckRing(rtyp))
      return NULL;
@@ -1453 +1464 @@
   return;
 id_found: // we have an id (in h) found, to set the data in from h
-  v->rtyp = IDHDL;
+  if (IDTYP(h)!=ALIAS_CMD)
+  {
+    v->rtyp = IDHDL;
+    v->flag = IDFLAG(h);
+    v->attribute=IDATTR(h);
+  }
+  else
+  {
+    v->rtyp = ALIAS_CMD;
+  }
+  v->name = IDID(h);
   v->data = (char *)h;
-  v->flag = IDFLAG(h);
-  v->name = IDID(h);
-  v->attribute=IDATTR(h);
   currRingHdl=save_ring;
 }