Removed unused constants

diff --git a/include/ulas.h b/include/ulas.h
index ab60854b2c1fc502ca1d7400a05593b0cb140f4f..4c9c998fe030ffcb6eb9944e0a4b63f58cf405b6 100644 (file)
--- a/include/ulas.h
+++ b/include/ulas.h
@@ -8,10 +8,6 @@
 
 #define ULAS_PATHMAX 4096
 #define ULAS_LINEMAX 4096
-#define ULAS_TOKMAX 64
-
-// max tokens per line...
-#define ULAS_TOKSMAX 64
 
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))

diff --git a/src/test.c b/src/test.c
index bb88598010bd34fc17dcb13f504dbce3c973fbd6..5b963fc1e2a6137cc1f8c7e0d2dd809bec8bae16 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -3,6 +3,8 @@
 #include <stdio.h>
 #include <assert.h>
 
+#define ULAS_TOKMAX 64
+
 #define TESTBEGIN(name) printf("[test %s]\n", (name));
 #define TESTEND(name) printf("[%s ok]\n", (name));
 

diff --git a/src/ulas.c b/src/ulas.c
index fbea85dc90af37dc62685473d2440f08fb6d2d81..fbf8d7b919a476cccd1123657214004aa1fff234 100644 (file)
--- a/src/ulas.c
+++ b/src/ulas.c
@@ -124,7 +124,7 @@ char *ulas_preprocexpand(struct ulas_preproc *pp, const char *raw_line,
   // if so expand it
   // only expand macros if they match toks[0] though!
   // otherwise memcpy the read bytes 1:1 into the new string
-  while (ulas_tokline(&pp->tok, &praw_line, ULAS_TOKMAX, isalnum)) {
+  while (ulas_tokline(&pp->tok, &praw_line, *n, isalnum)) {
   }
 
   // TODO: actually expand here...
@@ -135,11 +135,6 @@ char *ulas_preprocexpand(struct ulas_preproc *pp, const char *raw_line,
 
 int ulas_preprocline(struct ulas_preproc *pp, FILE *dst, const char *raw_line,
                      size_t n) {
-  if (n > ULAS_LINEMAX) {
-    ULASERR("%s: line exceeds %d (LINEMAX)\n", raw_line, ULAS_LINEMAX);
-    return -1;
-  }
-
   char *line = ulas_preprocexpand(pp, raw_line, &n);
   const char *pline = line;
 
@@ -152,13 +147,13 @@ int ulas_preprocline(struct ulas_preproc *pp, FILE *dst, const char *raw_line,
   enum ulas_ppdirs found_dir = ULAS_PPDIR_NONE;
 
   // check if the first token is any of the valid preproc directives
-  if (ulas_tokline(&pp->tok, &pline, ULAS_TOKMAX, isspace)) {
+  if (ulas_tokline(&pp->tok, &pline, n, isspace)) {
     // not a preproc directive...
     if (pp->tok.buf[0] != ULAS_TOK_PREPROC_BEGIN) {
       goto found;
     }
     for (size_t i = 0; dirstrs[i]; i++) {
-      if (strncmp(dirstrs[i], pp->tok.buf, ULAS_TOKMAX) == 0) {
+      if (strncmp(dirstrs[i], pp->tok.buf, pp->tok.maxlen) == 0) {
         found_dir = dirs[i];
         goto found;
       }
@@ -191,10 +186,8 @@ int ulas_preproc(FILE *dst, const char *dstname, FILE *src,
     return -1;
   }
 
-  struct ulas_preproc pp = {NULL, 0, srcname, dstname};
-
-  pp.line = ulas_str(1);
-  pp.tok = ulas_str(1);
+  struct ulas_preproc pp = {NULL,    0,           srcname,
+                            dstname, ulas_str(1), ulas_str(1)};
 
   while (fgets(buf, ULAS_LINEMAX, src) != NULL) {
     if (ulas_preprocline(&pp, dst, buf, strlen(buf)) == -1) {