Changeset f09a99 in git

Timestamp:

May 5, 2014, 1:50:13 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

508d46c825fbaedc044e70aed39323c9230fa353

Parents:

f0cd66c1f26eeb797e2b9d7e5427eefb62882e07

Message:

chg: allow in newstruct definition: white space, alnum member names

File:

• Singular/newstruct.cc (modified) (3 diffs)

Singular/newstruct.cc

@@ -700 +700 @@
   {
     // read type:
-    while (*p==' ') p++;
+    while ((*p!='\0') && (*p<=' ')) p++;
     start=p;
-    while (isalpha(*p)) p++;
+    while (isalnum(*p)) p++;
     *p='\0';
     IsCmd(start,t);
@@ -719 +719 @@
     // read name:
     p++;
-    while (*p==' ') p++;
+    while ((*p!='\0') && (*p<=' ')) p++;
     start=p;
-    while (isalpha(*p)) p++;
+    while (isalnum(*p)) p++;
     c=*p;
     *p='\0';
     elem->typ=t;
     elem->pos=res->size;
-    if (*start=='\0') /*empty name*/
-    {
-      WerrorS("empty name for element");
+    if ((*start=='\0') /*empty name*/||(isdigit(*start)))
+    {
+      WerrorS("illegal/empty name for element");
       goto error_in_newstruct_def;
     }
@@ -739 +739 @@
     // next ?
     *p=c;
-    while (*p==' ') p++;
+    while ((*p!='\0') && (*p<=' ')) p++;
     if (*p!=',')
     {