Changeset c3abfcc in git

Timestamp:

Nov 30, 2017, 2:00:45 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

096909fb00e2a3f43dd830aae1cf62510ebb98b5

Parents:

28d88317f5be18d83c49515617dfb0e38ae38600

Message:

fix: tr #813

Files:

• Singular/iparith.cc (modified) (2 diffs)
• Tst/Short/bug_newstruct.res.gz.uu (modified) (1 diff)
• Tst/Short/bug_newstruct.stat (modified) (1 diff)
• Tst/Short/bug_newstruct.tst (modified) (1 diff)

Singular/iparith.cc

@@ -2607 +2607 @@
   // u: the name of the new type
   // v: the elements
-  newstruct_desc d=newstructFromString((const char *)v->Data());
-  if (d!=NULL) newstruct_setup((const char *)u->Data(),d);
+  const char *s=(const char *)u->Data();
+  newstruct_desc d=NULL;
+  if (strlen(s)>=2)
+  {
+    d=newstructFromString((const char *)v->Data());
+    if (d!=NULL) newstruct_setup(s,d);
+  }
+  else WerrorS("name of newstruct must be longer than 1 character");
   return d==NULL;
 }
@@ -7805 +7811 @@
     case 0:{
         PrintS("delete all variables\n");
-        killlocals(0);
-        WerrorS("restarting...");
-        break;
+        killlocals(0);
+        WerrorS("restarting...");
+        break;
       };
     default: WerrorS("not implemented");

Tst/Short/bug_newstruct.res.gz.uu

@@ -1 +1 @@
 begin 640 bug_newstruct.res.gz
-M'XL("*%C15@``V)U9U]N97=S=')U8W0N<F5S`%5136O#,`R]YU<(TT,"16W6
-MKXVT.HQ="F44NGM)DZ88$F=4\O;W9V>KG9TLWM/[0#Y]O.W?`2`G..Q?00D+
-MMOJBBN3TQSP1./"LC98T*Q+_`A%<[.ULKM\L=UL)N@E92@FJ!4&8E^B]5659
-M^HZE1NY'_JLA6=V:TKC@_]R:8#:#$`,LMFD"N\%(I>JSUE^:^[N:JE:SV[5=
-M5YJ:IU#UY@I2ZE9ET?IY5/`%89`<`IW/Z5=61<B=Z)$!QPB[^QSQ$;8;62P\
-KX6-W(Y,E>>V`;GT`)4&Z]1TH;*YBP7R-PQ_X"UM.\ZR8)#\(:IS:N0$`````
+M'XL(")H`(%H"`V)U9U]N97=S=')U8W0N<F5S`'52RT[#,!"\YRM6AD,K52ZF
+M3VAK),2E4H4JE7OK.$YJ*;&1O8'?QVZI$PZ<LMGQS.R.??AXV[X#`..PV[X"
+M08^TUCE998=?Y)%#:!ZUT3@8KK+X!<XA;ZNC4=\>72N1AHIZ%)A8$PZIGM*H
+M363KT38>"^IM3W]V<295*4PP_HO-.8S'D&S`8UN6"5W0#AJ0ST)_:6\=&9%:
+M^W"V;1IA"C\":8T"%+HFPTYZV1OPB<*%LDLP>^!7FNQ:(:*;!^R[=LAG3V]F
+MFY[$)`+1=M,3F?+(O737T8!GB;J.,_!T<M8-R.8TYH".PMV235+[;P`^;!YJ
+M;2H0<=.PV`L8T2BP92_#)EP#Y`IJ:RKE`,_"``-Y%DY(5.Y*4\Z%+:V4K7.J
+M`&T@_.:JM$[!U;W6(1VV>(;3_R.<TJ2]M%E(.SZH^%Q:/V##U7WV`RKOQV2&
+#`@``
 `
 end

Tst/Short/bug_newstruct.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:140424
-1 >> tst_memory_1 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2228224
-1 >> tst_memory_2 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:2228224
-1 >> tst_timer_1 :: 1480942444:4100, 64 bit:4.1.0:x86_64-Linux:nepomuck:1
+1 >> tst_memory_0 :: 1512046746:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:115656
+1 >> tst_memory_1 :: 1512046746:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:2215936
+1 >> tst_memory_2 :: 1512046746:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:2215936
+1 >> tst_timer_1 :: 1512046746:4104, 64 bit:4.1.0:x86_64-Linux:nepomuck:1

Tst/Short/bug_newstruct.tst

@@ -14 +14 @@
 P;
 
+// tr. #813
+newstruct("s","string a");
+
 tst_status(1);$