correction of function 'nextvar'

5 files changed, 41 insertions, 54 deletions

diff --git a/opcode.c b/opcode.c
index 263e9035..7f5f8bd6 100644
--- a/opcode.c
+++ b/opcode.c
@@ -3,7 +3,7 @@
 ** TecCGraf - PUC-Rio
 */
 
-char *rcs_opcode="$Id: opcode.c,v 3.10 1994/11/11 14:00:08 roberto Exp roberto $";
+char *rcs_opcode="$Id: opcode.c,v 3.11 1994/11/13 16:17:04 roberto Exp $";
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -117,14 +117,14 @@ static void lua_checkstack (Word n)
 
 
 /*
-** Concatenate two given strings, creating a mark space at the beginning.
-** Return the new string pointer.
+** Concatenate two given strings. Return the new string pointer.
 */
 static char *lua_strconc (char *l, char *r)
 {
  static char *buffer = NULL;
  static int buffer_size = 0;
- int n = strlen(l)+strlen(r)+1;
+ int nl = strlen(l);
+ int n = nl+strlen(r)+1;
  if (n > buffer_size)
  {
    buffer_size = n;
@@ -137,7 +137,9 @@ static char *lua_strconc (char *l, char *r)
      lua_error("concat - not enough memory");
    }
   }
-  return strcat(strcpy(buffer,l),r);
+  strcpy(buffer,l);
+  strcpy(buffer+nl, r);
+  return buffer;
 }
 
 
@@ -373,7 +375,7 @@ int lua_callfunction (lua_Object function)
 
 int lua_call (char *funcname)
 {
- int n = lua_findsymbol(funcname);
+ int n = luaI_findsymbolbyname(funcname);
  return do_protectedrun(&s_object(n), MULT_RET);
 }
 
@@ -548,7 +550,7 @@ lua_Object lua_getlocked (int ref)
 */
 lua_Object lua_getglobal (char *name)
 {
- int n = lua_findsymbol(name);
+ int n = luaI_findsymbolbyname(name);
  adjustC(0);
  *(top++) = s_object(n);
  CBase++;  /* incorporate object in the stack */
@@ -561,7 +563,7 @@ lua_Object lua_getglobal (char *name)
 */
 int lua_storeglobal (char *name)
 {
- int n = lua_findsymbol (name);
+ int n = luaI_findsymbolbyname(name);
  if (n < 0) return 1;
  adjustC(1);
  s_object(n) = *(--top);
@@ -698,9 +700,10 @@ static int lua_execute (Byte *pc, int base)
   {
    case PUSHNIL: tag(top++) = LUA_T_NIL; break;
 
-   case PUSH0: tag(top) = LUA_T_NUMBER; nvalue(top++) = 0; break;
-   case PUSH1: tag(top) = LUA_T_NUMBER; nvalue(top++) = 1; break;
-   case PUSH2: tag(top) = LUA_T_NUMBER; nvalue(top++) = 2; break;
+   case PUSH0: case PUSH1: case PUSH2:
+     tag(top) = LUA_T_NUMBER;
+     nvalue(top++) = opcode-PUSH0;
+     break;
 
    case PUSHBYTE: tag(top) = LUA_T_NUMBER; nvalue(top++) = *pc++; break;
 
@@ -813,8 +816,6 @@ static int lua_execute (Byte *pc, int base)
     else m = *(pc++) * FIELDS_PER_FLUSH;
     n = *(pc++);
     arr = top-n-1;
-    if (tag(arr) != LUA_T_ARRAY)
-      lua_reportbug ("internal error - table expected");
     while (n)
     {
      tag(top) = LUA_T_NUMBER; nvalue(top) = n+m;
@@ -829,8 +830,6 @@ static int lua_execute (Byte *pc, int base)
    {
     int n = *(pc++);
     Object *arr = top-n-1;
-    if (tag(arr) != LUA_T_ARRAY)
-      lua_reportbug ("internal error - table expected");
     while (n)
     {
      CodeWord code;
@@ -856,39 +855,15 @@ static int lua_execute (Byte *pc, int base)
     CodeWord size;
     get_word(size,pc);
     top++;
-    avalue(top-1) = lua_createarray(size.w);
     tag(top-1) = LUA_T_ARRAY;
+    avalue(top-1) = lua_createarray(size.w);
    }
    break;
 
    case EQOP:
    {
-    int res;
-    Object *l = top-2;
-    Object *r = top-1;
+    int res = lua_equalObj(top-2, top-1);
     --top;
-    if (tag(l) != tag(r))
-     res = 0;
-    else
-    {
-     switch (tag(l))
-     {
-      case LUA_T_NIL:
-        res = 1; break;
-      case LUA_T_NUMBER:
-        res = (nvalue(l) == nvalue(r)); break;
-      case LUA_T_ARRAY:
-        res = (avalue(l) == avalue(r)); break;
-      case LUA_T_FUNCTION:
-        res = (bvalue(l) == bvalue(r)); break;
-      case LUA_T_CFUNCTION:
-       res = (fvalue(l) == fvalue(r)); break;
-      case LUA_T_STRING:
-        res = (strcmp (svalue(l), svalue(r)) == 0); break;
-      default:
-        res = (uvalue(l) == uvalue(r)); break;
-     }
-    }
     tag(top-1) = res ? LUA_T_NUMBER : LUA_T_NIL;
     nvalue(top-1) = 1;
    }
@@ -1003,6 +978,7 @@ static int lua_execute (Byte *pc, int base)
 
    case NOTOP:
     tag(top-1) = (tag(top-1) == LUA_T_NIL) ? LUA_T_NUMBER : LUA_T_NIL;
+    nvalue(top-1) = 1;
    break;
 
    case ONTJMP:
diff --git a/table.c b/table.c
index 20ab6046..d37b7b03 100644
--- a/table.c
+++ b/table.c
@@ -3,7 +3,7 @@
 ** Module to control static tables
 */
 
-char *rcs_table="$Id: table.c,v 2.16 1994/11/11 14:00:08 roberto Exp roberto $";
+char *rcs_table="$Id: table.c,v 2.17 1994/11/14 21:40:14 roberto Exp $";
 
 #include <stdlib.h>
 #include <string.h>
@@ -41,6 +41,8 @@ Word lua_nentity;   /* counter of new entities (strings and arrays) */
 Word lua_recovered;   /* counter of recovered entities (strings and arrays) */
 
 
+static void lua_nextvar (void);
+
 /*
 ** Initialise symbol table with internal functions
 */
@@ -239,9 +241,10 @@ char *lua_filename (void)
 /*
 ** Internal function: return next global variable
 */
-void lua_nextvar (void)
+static void lua_nextvar (void)
 {
- char *varname, *next;
+ char *varname;
+ TreeNode *next;
  lua_Object o = lua_getparam(1);
  if (o == 0)
    lua_error ("too few arguments to function `nextvar'");
@@ -266,8 +269,8 @@ void lua_nextvar (void)
  {
   Object name;
   tag(&name) = LUA_T_STRING;
-  svalue(&name) = next;
+  svalue(&name) = next->str;
   luaI_pushobject(&name);
-  luaI_pushobject(&s_object(indexstring(next)));
+  luaI_pushobject(&s_object(next->varindex));
  }
 }
diff --git a/table.h b/table.h
index 423ba3dd..1433814d 100644
--- a/table.h
+++ b/table.h
@@ -1,7 +1,7 @@
 /*
 ** Module to control static tables
 ** TeCGraf - PUC-Rio
-** $Id: table.h,v 2.4 1994/11/03 21:48:36 roberto Exp roberto $
+** $Id: table.h,v 2.5 1994/11/14 21:40:14 roberto Exp roberto $
 */
 
 #ifndef table_h
@@ -31,6 +31,5 @@ char *lua_createstring    (char *s);
 char *lua_addfile         (char *fn);
 int   lua_delfile         (void);
 char *lua_filename        (void);
-void  lua_nextvar         (void);
 
 #endif
diff --git a/tree.c b/tree.c
index bca29994..eee5a204 100644
--- a/tree.c
+++ b/tree.c
@@ -3,7 +3,7 @@
 ** TecCGraf - PUC-Rio
 */
  
-char *rcs_tree="$Id: tree.c,v 1.3 1994/11/10 20:41:37 roberto Exp roberto $";
+char *rcs_tree="$Id: tree.c,v 1.4 1994/11/14 21:40:14 roberto Exp roberto $";
 
 
 #include <stdlib.h>
@@ -169,9 +169,18 @@ static TreeNode *tree_next (TreeNode *node, char *str)
  }
 }
 
-char *lua_varnext (char *n)
+TreeNode *lua_varnext (char *n)
 {
- TreeNode *result = tree_next(constant_root, n);
- return result != NULL ? result->str : NULL;
+  TreeNode *result;
+  char *name = n;
+  while (1)
+  { /* repeat until a valid (non nil) variable */
+    result = tree_next(constant_root, name);
+    if (result == NULL) return NULL;
+    if (result->varindex != UNMARKED_STRING &&
+        s_tag(result->varindex) != LUA_T_NIL)
+      return result;
+    name = result->str;
+  }
 }
 
diff --git a/tree.h b/tree.h
index 0e7c27c9..7587f4ec 100644
--- a/tree.h
+++ b/tree.h
@@ -1,7 +1,7 @@
 /*
 ** tree.h
 ** TecCGraf - PUC-Rio
-** $Id: tree.h,v 1.1 1994/07/19 21:24:17 celes Exp roberto $
+** $Id: tree.h,v 1.2 1994/11/14 21:40:14 roberto Exp roberto $
 */
 
 #ifndef tree_h
@@ -31,6 +31,6 @@ typedef struct TreeNode
 char *lua_strcreate    (char *str);
 TreeNode *lua_constcreate  (char *str);
 void  lua_strcollector (void);
-char *lua_varnext      (char *n);
+TreeNode *lua_varnext      (char *n);
 
 #endif