[Kst] kdeextragear-2/kst/kst

[Andrew Walker]

CVS commit by arwalker: 

Get the event monitor expression parser working again


  M +7 -2      Makefile.am   1.83
  M +16 -16    exscan.c   1.2
  M +16 -16    exscan.l   1.3


--- kdeextragear-2/kst/kst/exscan.c  #1.1:1.2
@@ -652,5 +652,5 @@ YY_RULE_SETUP
                         /*printf("Found a number\n");*/
                         exlval.number = atof(extext);
-                        return TEX_NUMBER;
+                        return T_NUMBER;
                 }
         YY_BREAK
@@ -661,5 +661,5 @@ YY_RULE_SETUP
                         /*printf("Found an ID\n");*/
                         exlval.data = strdup(extext);
-                        return TEX_IDENTIFIER;
+                        return T_IDENTIFIER;
                 }
         YY_BREAK
@@ -670,5 +670,5 @@ YY_RULE_SETUP
                         /*printf("Found a data spec\n");*/
                         exlval.data = strdup(extext);
-                        return TEX_DATA;
+                        return T_DATA;
                 }
         YY_BREAK
@@ -676,60 +676,60 @@ case 4:
 YY_RULE_SETUP
 #line 34 "exscan.l"
-return TEX_NOT;
+return T_NOT;
         YY_BREAK
 case 5:
 YY_RULE_SETUP
 #line 36 "exscan.l"
-return TEX_AND;
+return T_AND;
         YY_BREAK
 case 6:
 YY_RULE_SETUP
 #line 38 "exscan.l"
-return TEX_OR;
+return T_OR;
         YY_BREAK
 case 7:
 YY_RULE_SETUP
 #line 40 "exscan.l"
-return TEX_LT;
+return T_LT;
         YY_BREAK
 case 8:
 YY_RULE_SETUP
 #line 42 "exscan.l"
-return TEX_LE;
+return T_LE;
         YY_BREAK
 case 9:
 YY_RULE_SETUP
 #line 44 "exscan.l"
-return TEX_GT;
+return T_GT;
         YY_BREAK
 case 10:
 YY_RULE_SETUP
 #line 46 "exscan.l"
-return TEX_GE;
+return T_GE;
         YY_BREAK
 case 11:
 YY_RULE_SETUP
 #line 48 "exscan.l"
-return TEX_EQ;
+return T_EQ;
         YY_BREAK
 case 12:
 YY_RULE_SETUP
 #line 50 "exscan.l"
-return TEX_ADD;
+return T_ADD;
         YY_BREAK
 case 13:
 YY_RULE_SETUP
 #line 52 "exscan.l"
-return TEX_SUBTRACT;
+return T_SUBTRACT;
         YY_BREAK
 case 14:
 YY_RULE_SETUP
 #line 54 "exscan.l"
-return TEX_MULTIPLY;
+return T_MULTIPLY;
         YY_BREAK
 case 15:
 YY_RULE_SETUP
 #line 56 "exscan.l"
-return TEX_DIVIDE;
+return T_DIVIDE;
         YY_BREAK
 case 16:
@@ -742,5 +742,5 @@ YY_RULE_SETUP
 #line 60 "exscan.l"
 {
-                        /*printf("Found char '%c'\n", extext[0]);*/
+                        /*printf("Found char '%c'\n", yytext[0]);*/
                         return extext[0];
                 }

--- kdeextragear-2/kst/kst/Makefile.am  #1.82:1.83
@@ -23,5 +23,9 @@
         kstvector.cpp \
         kstrvector.cpp \
-        kstscalar.cpp
+        kstscalar.cpp \
+        enodes.cpp \
+        enodefactory.cpp \
+        exparse.c \
+        exscan.c
 
 kst_SOURCES = \
@@ -125,5 +129,6 @@
         exparse.c \
         eparse.c \
-        escan.c
+        escan.c \
+        exscan.c
 #       exparse.y \
 #       eparse.y \