Update with new lefty, fixing many bugs and supporting new features

diff --git a/cmd/lefty/lex.h b/cmd/lefty/lex.h
index d5e6a7277712440a6746b5859c8230d9a4183439..c6ce4a2dad6fa1a0c6d23dff43bcc698650b4440 100644 (file)
--- a/cmd/lefty/lex.h
+++ b/cmd/lefty/lex.h
@@ -1,6 +1,6 @@
 /* $Id$ $Revision$ */
-/* vim:set shiftwidth=4 ts=8: */
-
+/* vim:set shiftwidth=4 ts=8: */ 
+    
 /**********************************************************
 *      This software is part of the graphviz package      *
 *                http://www.graphviz.org/                 *
@@ -18,34 +18,67 @@
 extern "C" {
 #endif
 
-
-/* Lefteris Koutsofios - AT&T Bell Laboratories */
+/* Lefteris Koutsofios - AT&T Labs Research */
 
 #ifndef _LEX_H
 #define _LEX_H
-    typedef enum {
-       L_SEMI, L_ASSIGN, L_OR, L_AND, L_EQ, L_NE, L_LT, L_LE, L_GT, L_GE,
-           L_PLUS,
-       L_MINUS, L_MUL, L_DIV, L_MOD, L_NOT, L_STRING, L_NUMBER, L_ID,
-           L_DOT,
-       L_LB, L_RB, L_FUNCTION, L_LP, L_RP, L_LCB, L_RCB, L_LOCAL, L_COLON,
-       L_COMMA, L_IF, L_ELSE, L_WHILE, L_FOR, L_IN, L_BREAK, L_CONTINUE,
-       L_RETURN, L_INTERNAL, L_EOF, L_SIZE
-    } Ltype_t;
+
+#define L_SEMI      0
+#define L_ASSIGN    1
+#define L_OR        2
+#define L_AND       3
+#define L_EQ        4
+#define L_NE        5
+#define L_LT        6
+#define L_LE        7
+#define L_GT        8
+#define L_GE        9
+#define L_PLUS     10
+#define L_MINUS    11
+#define L_MUL      12
+#define L_DIV      13
+#define L_MOD      14
+#define L_NOT      15
+#define L_STRING   16
+#define L_NUMBER   17
+#define L_ID       18
+#define L_DOT      19
+#define L_LB       20
+#define L_RB       21
+#define L_FUNCTION 22
+#define L_LP       23
+#define L_RP       24
+#define L_LCB      25
+#define L_RCB      26
+#define L_LOCAL    27
+#define L_COLON    28
+#define L_COMMA    29
+#define L_IF       30
+#define L_ELSE     31
+#define L_WHILE    32
+#define L_FOR      33
+#define L_IN       34
+#define L_BREAK    35
+#define L_CONTINUE 36
+#define L_RETURN   37
+#define L_INTERNAL 38
+#define L_EOF      39
+#define L_SIZE     40
 
 #define MAXTOKEN 1000
-    typedef char *Lname_t;
+typedef char *Lname_t;
 
-    extern Ltype_t Ltok;
-    extern char Lstrtok[];
-    extern Lname_t Lnames[];
+extern int Ltok;
+extern char Lstrtok[];
+extern Lname_t Lnames[];
 
-    void Lsetsrc(int, char *, FILE *, int, int);
-    void Lgetsrc(int *, char **, FILE **, int *, int *);
-    void Lprintpos(void);
-    void Lgtok(void);
-#endif                         /* _LEX_H */
+void Lsetsrc (int, char *, FILE *, int, int);
+void Lgetsrc (int *, char **, FILE **, int *, int *);
+void Lprintpos (void);
+void Lgtok (void);
+#endif /* _LEX_H */
 
 #ifdef __cplusplus
 }
 #endif
+