Changeset ad2543e in git

Timestamp:

Jan 30, 2023, 3:26:58 PM (10 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '379ec2d037299db64c43fe3550b5ba8fe508dbe5')

Children:

c987db42cd2ec943b97ac5746c99892ceddf909c

Parents:

2234726c50d679d6664181a5c72f75a6fd64a787

Message:

libparse: indep. of singular_ressources

Location:

Singular

Files:

• Makefile.am (modified) (1 diff)
• utils.cc (modified) (5 diffs)

Singular/Makefile.am

@@ -183 +183 @@
 libparse_SOURCES = libparse.cc utils.cc utils.h
 
-libparse_LDADD = ${top_builddir}/resources/libsingular_resources.la
+#libparse_LDADD = ${top_builddir}/resources/libsingular_resources.la
 libparse_LDFLAGS = ${AM_LDFLAGS}
 

Singular/utils.cc

@@ -3 +3 @@
 #ifdef STANDALONE_PARSER
 
-#include "resources/fegetopt.h"
+#include <unistd.h>
 #include "Singular/utils.h"
 #include "Singular/libparse.h"
@@ -44 +44 @@
   int c;
 
-  while((c=fe_getopt(argc, argv, "ihdc:sf:"))>=0)
+  while((c=getopt(argc, argv, "ihdc:sf:"))>=0)
   {
     switch(c)
@@ -50 +50 @@
         case 'd':
           lpverbose = 1;
-          if(isdigit(argv[fe_optind-1][0])) sscanf(optarg, "%d", &lpverbose);
-          else fe_optind--;
-          break;
-        case 'f': lib_file = argv[fe_optind-1];
+          if(isdigit(argv[optind-1][0])) sscanf(optarg, "%d", &lpverbose);
+          else optind--;
+          break;
+        case 'f': lib_file = argv[optind-1];
           break;
         case 's':
@@ -68 +68 @@
           usage(argv[0]);
           break;
-        case -1 : printf("no such option:%s\n", argv[fe_optind]);
+        case -1 : printf("no such option:%s\n", argv[optind]);
           usage(argv[0]);
           break;
-        default: printf("no such option.%x, %c %s\n", c&0xff, c, argv[fe_optind]);
+        default: printf("no such option.%x, %c %s\n", c&0xff, c, argv[optind]);
           usage(argv[0]);
     }
@@ -87 +87 @@
   else
   {
-    while(argc>fe_optind && yylpin==NULL)
-    {
-      yylpin = fopen( argv[fe_optind], "rb" );
+    while(argc>optind && yylpin==NULL)
+    {
+      yylpin = fopen( argv[optind], "rb" );
       if(yylpin!=NULL)
       {
-        lib_file = argv[fe_optind];
+        lib_file = argv[optind];
         if (! (texinfo_out || category_out) )
-          printf("Checking library '%s'\n", argv[fe_optind]);
+          printf("Checking library '%s'\n", argv[optind]);
         else if (! category_out)
           printf("$library = \"%s\";\n", lib_file);
       }
-      else fe_optind++;
+      else optind++;
     }
   }