new header "lex.h".

5 files changed, 15 insertions, 25 deletions

diff --git a/inout.c b/inout.c
index 8ba4b6bb..97f55465 100644
--- a/inout.c
+++ b/inout.c
@@ -5,15 +5,14 @@
 ** Also provides some predefined lua functions.
 */
 
-char *rcs_inout="$Id: inout.c,v 2.29 1996/02/07 14:13:47 roberto Exp roberto $";
+char *rcs_inout="$Id: inout.c,v 2.30 1996/02/12 18:32:40 roberto Exp roberto $";
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "mem.h"
+#include "lex.h"
 #include "opcode.h"
-#include "hash.h"
 #include "inout.h"
 #include "table.h"
 #include "tree.h"
diff --git a/lex.c b/lex.c
index 0940359c..c65d2253 100644
--- a/lex.c
+++ b/lex.c
@@ -1,4 +1,4 @@
-char *rcs_lex = "$Id: lex.c,v 2.24 1996/02/09 19:35:23 roberto Exp roberto $";
+char *rcs_lex = "$Id: lex.c,v 2.25 1996/02/12 18:32:40 roberto Exp roberto $";
  
 
 #include <ctype.h>
@@ -8,7 +8,7 @@ char *rcs_lex = "$Id: lex.c,v 2.24 1996/02/09 19:35:23 roberto Exp roberto $";
 #include "mem.h"
 #include "tree.h"
 #include "table.h"
-#include "opcode.h"
+#include "lex.h"
 #include "inout.h"
 #include "luadebug.h"
 #include "parser.h"
diff --git a/lua.stx b/lua.stx
index f16630d3..7d83e62b 100644
--- a/lua.stx
+++ b/lua.stx
@@ -1,6 +1,6 @@
 %{
 
-char *rcs_luastx = "$Id: lua.stx,v 3.29 1996/02/07 18:10:27 roberto Exp roberto $";
+char *rcs_luastx = "$Id: lua.stx,v 3.30 1996/02/12 18:32:40 roberto Exp roberto $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,6 +8,7 @@ char *rcs_luastx = "$Id: lua.stx,v 3.29 1996/02/07 18:10:27 roberto Exp roberto
 
 #include "luadebug.h"
 #include "mem.h"
+#include "lex.h"
 #include "opcode.h"
 #include "hash.h"
 #include "inout.h"
diff --git a/makefile b/makefile
index f1cc4b84..b3971be8 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.18 1996/01/09 20:22:08 roberto Exp roberto $
+# $Id: makefile,v 1.19 1996/02/07 18:14:38 roberto Exp roberto $
 
 #configuration
 
@@ -69,19 +69,18 @@ clear	:
 fallback.o : fallback.c mem.h fallback.h opcode.h lua.h types.h tree.h func.h 
 func.o : func.c luadebug.h lua.h table.h tree.h types.h opcode.h func.h mem.h 
 hash.o : hash.c mem.h opcode.h lua.h types.h tree.h func.h hash.h table.h 
-inout.o : inout.c mem.h opcode.h lua.h types.h tree.h func.h hash.h inout.h \
-  table.h 
+inout.o : inout.c lex.h opcode.h lua.h types.h tree.h func.h inout.h table.h 
 iolib.o : iolib.c lua.h luadebug.h lualib.h 
-lex.o : lex.c mem.h tree.h types.h table.h opcode.h lua.h func.h inout.h luadebug.h \
-  parser.h ugly.h 
+lex.o : lex.c mem.h tree.h types.h table.h opcode.h lua.h func.h lex.h inout.h \
+  luadebug.h parser.h ugly.h 
 lua.o : lua.c lua.h lualib.h 
 mathlib.o : mathlib.c lualib.h lua.h 
 mem.o : mem.c mem.h lua.h table.h tree.h types.h opcode.h func.h 
 opcode.o : opcode.c luadebug.h lua.h mem.h opcode.h types.h tree.h func.h hash.h \
   inout.h table.h fallback.h 
-parser.o : parser.c luadebug.h lua.h mem.h opcode.h types.h tree.h func.h hash.h \
-  inout.h table.h 
+parser.o : parser.c luadebug.h lua.h mem.h lex.h opcode.h types.h tree.h func.h \
+  hash.h inout.h table.h 
 strlib.o : strlib.c lua.h lualib.h 
 table.o : table.c mem.h opcode.h lua.h types.h tree.h func.h hash.h table.h \
   inout.h fallback.h luadebug.h 
-tree.o : tree.c mem.h lua.h tree.h types.h table.h opcode.h func.h 
+tree.o : tree.c mem.h lua.h tree.h types.h hash.h opcode.h func.h table.h 
diff --git a/opcode.h b/opcode.h
index e66c9676..fe96bccd 100644
--- a/opcode.h
+++ b/opcode.h
@@ -1,6 +1,6 @@
 /*
 ** TeCGraf - PUC-Rio
-** $Id: opcode.h,v 3.15 1995/12/21 16:14:04 roberto Exp roberto $
+** $Id: opcode.h,v 3.16 1996/01/26 18:03:19 roberto Exp roberto $
 */
 
 #ifndef opcode_h
@@ -11,9 +11,6 @@
 #include "tree.h"
 #include "func.h"
 
-#ifndef real
-#define real float
-#endif
 
 #define FIELDS_PER_FLUSH 40
 
@@ -74,12 +71,9 @@ typedef enum
 #define MULT_RET        255
 
 
-typedef void (*Cfunction) (void);
-typedef int  (*Input) (void);
-
 typedef union
 {
- Cfunction     f;
+ lua_CFunction f;
  real          n;
  TaggedString *ts;
  TFunc         *tf;
@@ -140,9 +134,6 @@ typedef union
 /* Exported functions */
 char   *lua_strdup (char *l);
 
-void    lua_setinput   (Input fn);      /* from "lex.c" module */
-char   *lua_lasttext   (void);          /* from "lex.c" module */
-int     luaY_lex (void);                /* from "lex.c" module */
 void    lua_parse      (TFunc *tf);     /* from "lua.stx" module */
 void    luaI_codedebugline (int line);  /* from "lua.stx" module */
 void    lua_travstack (int (*fn)(Object *));