Changeset 4878eb in git

Timestamp:

Mar 2, 2011, 2:41:47 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

eb5526e648e4ec140d17be3e624211dd233a7bfd

Parents:

31a04de9654ef6c91a67d31ba39e3e2f1c9537fe

Message:

better error handling for newstruct member names

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

File:

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

Singular/newstruct.cc

@@ -361 +361 @@
     {
       WerrorS("empty name for element");
-      omFree(elem);
-      omFree(ss);
-      omFree(res);
-      currRingHdl=save_ring;
-      return NULL;
+      goto error_in_newstruct_def;
     }
     elem->name=omStrDup(start);
@@ -377 +373 @@
     while (*p==' ') p++;
     if (*p!=',') break;
+    if (*p!='\0')
+    {
+      Werror("unknown character in newstruct:>>%s<<",p);
+      goto error_in_newstruct_def;
+    }
     p++;
   }
@@ -383 +384 @@
   //Print("new type with %d elements\n",res->size);
   return res;
+error_in_newstruct_def:
+   omFree(elem);
+   omFree(ss);
+   omFree(res);
+   currRingHdl=save_ring;
+   return NULL;
 }
 newstruct_desc newstructFromString(const char *s)