*** empty log message ***

ase/awk/parse.c

@@ -1,5 +1,5 @@
 /*
- * $Id: parse.c,v 1.46 2006-02-05 13:45:59 bacon Exp $
+ * $Id: parse.c,v 1.47 2006-02-05 14:21:18 bacon Exp $
  */
 
 #include <xp/awk/awk.h>
@@ -119,9 +119,6 @@ static int __classify_ident (xp_awk_t* awk, const xp_char_t* ident);
 
 static xp_long_t __str_to_long (const xp_char_t* name);
 
-static INLINE xp_size_t __find_func_arg (xp_awk_t* awk, const xp_char_t* name);
-static INLINE xp_size_t __find_variable (xp_awk_t* awk, const xp_char_t* name);
-
 struct __kwent 
 { 
 	const xp_char_t* name; 
@@ -523,14 +520,14 @@ static xp_awk_node_t* __parse_block (xp_awk_t* awk, xp_bool_t is_top)
 
 			if (__get_token(awk) == -1) {
 				xp_awk_tab_remrange (
-					&awk->parse.locals, nlocals - 1, 
+					&awk->parse.locals, nlocals, 
 					xp_awk_tab_getsize(&awk->parse.locals) - nlocals);
 				return XP_NULL;
 			}
 
 			if (__collect_locals(awk, nlocals) == XP_NULL) {
 				xp_awk_tab_remrange (
-					&awk->parse.locals, nlocals - 1, 
+					&awk->parse.locals, nlocals, 
 					xp_awk_tab_getsize(&awk->parse.locals) - nlocals);
 				return XP_NULL;
 			}
@@ -543,7 +540,7 @@ static xp_awk_node_t* __parse_block (xp_awk_t* awk, xp_bool_t is_top)
 	while (1) {
 		if (MATCH(awk,TOKEN_EOF)) {
 			xp_awk_tab_remrange (
-				&awk->parse.locals, nlocals - 1, 
+				&awk->parse.locals, nlocals, 
 				xp_awk_tab_getsize(&awk->parse.locals) - nlocals);
 			if (head != XP_NULL) xp_awk_clrpt (head);
 			PANIC (awk, XP_AWK_EENDSRC);
@@ -552,7 +549,7 @@ static xp_awk_node_t* __parse_block (xp_awk_t* awk, xp_bool_t is_top)
 		if (MATCH(awk,TOKEN_RBRACE)) {
 			if (__get_token(awk) == -1) {
 				xp_awk_tab_remrange (
-					&awk->parse.locals, nlocals - 1, 
+					&awk->parse.locals, nlocals, 
 					xp_awk_tab_getsize(&awk->parse.locals) - nlocals);
 				if (head != XP_NULL) xp_awk_clrpt (head);
 				return XP_NULL; 
@@ -563,7 +560,7 @@ static xp_awk_node_t* __parse_block (xp_awk_t* awk, xp_bool_t is_top)
 		node = __parse_statement (awk);
 		if (node == XP_NULL) {
 			xp_awk_tab_remrange (
-				&awk->parse.locals, nlocals - 1, 
+				&awk->parse.locals, nlocals, 
 				xp_awk_tab_getsize(&awk->parse.locals) - nlocals);
 			if (head != XP_NULL) xp_awk_clrpt (head);
 			return XP_NULL;
@@ -582,7 +579,7 @@ static xp_awk_node_t* __parse_block (xp_awk_t* awk, xp_bool_t is_top)
 	block = (xp_awk_node_block_t*) xp_malloc (xp_sizeof(xp_awk_node_block_t));
 	if (block == XP_NULL) {
 		xp_awk_tab_remrange (
-			&awk->parse.locals, nlocals - 1, 
+			&awk->parse.locals, nlocals, 
 			xp_awk_tab_getsize(&awk->parse.locals) - nlocals);
 		xp_awk_clrpt (head);
 		PANIC (awk, XP_AWK_ENOMEM);
@@ -592,7 +589,7 @@ static xp_awk_node_t* __parse_block (xp_awk_t* awk, xp_bool_t is_top)
 	if (tmp > awk->parse.nlocals_max) awk->parse.nlocals_max = tmp;
 
 	xp_awk_tab_remrange (
-		&awk->parse.locals, nlocals - 1, tmp - nlocals);
+		&awk->parse.locals, nlocals, tmp - nlocals);
 
 	/* adjust number of locals for a block without any statements */
 	if (head == NULL) tmp = 0;
@@ -1020,7 +1017,7 @@ static xp_awk_node_t* __parse_primary (xp_awk_t* awk)
 			}
 
 			/* search the local variable list */
-			idxa = xp_awk_tab_rfind(&awk->parse.locals, name_dup, 0);
+			idxa = xp_awk_tab_rrfind(&awk->parse.locals, name_dup, 0);
 			if (idxa != (xp_size_t)-1) {
 				node->type = XP_AWK_NODE_VAR;
 				node->next = XP_NULL;
@@ -1169,7 +1166,7 @@ static xp_awk_node_t* __parse_hashidx (xp_awk_t* awk, xp_char_t* name)
 	}
 
 	/* search the parameter name list */
-	idxa = xp_awk_tab_find (&awk->parse.params, name, 0);
+	idxa = xp_awk_tab_find(&awk->parse.params, name, 0);
 	if (idxa != (xp_size_t)-1) {
 		node->type = XP_AWK_NODE_ARGIDX;
 		node->next = XP_NULL;
@@ -1181,13 +1178,34 @@ static xp_awk_node_t* __parse_hashidx (xp_awk_t* awk, xp_char_t* name)
 		return (xp_awk_node_t*)node;
 	}
 
-	// TODO: search variable list 
+	/* search the local variable list */
-	node->type = XP_AWK_NODE_VARIDX;
+	idxa = xp_awk_tab_rrfind(&awk->parse.locals, name, 0);
-	node->next = XP_NULL;
+	if (idxa != (xp_size_t)-1) {
-	node->id.name = name;
+		node->type = XP_AWK_NODE_VARIDX;
-	node->idx = idx;
+		node->next = XP_NULL;
+		//node->id.name = XP_NULL;
+		node->id.name = name;
+		node->id.idxa = idxa;
+		node->idx = idx;
 
-	return (xp_awk_node_t*)node;
+		return (xp_awk_node_t*)node;
+	}
+
+	/* TODO: search the global variable list... */
+	/* search the global variable list */
+
+	if (awk->opt.parse & XP_AWK_IMPLICIT) {
+		node->type = XP_AWK_NODE_VAR;
+		node->next = XP_NULL;
+		node->id.name = name;
+		node->id.idxa = (xp_size_t)-1;
+		return (xp_awk_node_t*)node;
+	}
+
+	/* undefined variable */
+	xp_awk_clrpt (idx);
+	xp_free (node);
+	PANIC (awk, XP_AWK_EUNDEF);
 }
 
 static xp_awk_node_t* __parse_funcall (xp_awk_t* awk, xp_char_t* name)
@@ -1890,15 +1908,3 @@ static xp_long_t __str_to_long (const xp_char_t* name)
 	return n;
 }
 
-static INLINE xp_size_t __find_func_arg (xp_awk_t* awk, const xp_char_t* name)
-{
-// TODO:
-	return (xp_size_t)-1;
-}
-
-static xp_size_t __find_variable (xp_awk_t* awk, const xp_char_t* name)
-{
-// TODO:
-	return (xp_size_t)-1;
-}
-

ase/awk/tab.c

@@ -1,5 +1,5 @@
 /*
- * $Id: tab.c,v 1.3 2006-02-05 13:45:59 bacon Exp $
+ * $Id: tab.c,v 1.4 2006-02-05 14:21:18 bacon Exp $
  */
 
 #include <xp/awk/tab.h>
@@ -166,9 +166,25 @@ xp_size_t xp_awk_tab_rfind (
 {
 	xp_size_t i;
 
+	if (index >= tab->size) return (xp_size_t)-1;
+
 	for (i = index + 1; i-- > 0; ) {
 		if (xp_strcmp(tab->buf[i], value) == 0) return i;
 	}
 
 	return (xp_size_t)-1;
 }
+
+xp_size_t xp_awk_tab_rrfind (
+	xp_awk_tab_t* tab, const xp_char_t* value, xp_size_t index)
+{
+	xp_size_t i;
+
+	if (index >= tab->size) return (xp_size_t)-1;
+
+	for (i = tab->size - index; i-- > 0; ) {
+		if (xp_strcmp(tab->buf[i], value) == 0) return i;
+	}
+
+	return (xp_size_t)-1;
+}

ase/awk/tab.h

@@ -1,5 +1,5 @@
 /*
- * $Id: tab.h,v 1.2 2006-02-05 13:45:59 bacon Exp $
+ * $Id: tab.h,v 1.3 2006-02-05 14:21:18 bacon Exp $
  */
 
 #ifndef _XP_AWK_TAB_H_
@@ -48,6 +48,9 @@ xp_size_t xp_awk_tab_find (
 	xp_awk_tab_t* tab, const xp_char_t* value, xp_size_t index);
 xp_size_t xp_awk_tab_rfind (
 	xp_awk_tab_t* tab, const xp_char_t* value, xp_size_t index);
+xp_size_t xp_awk_tab_rrfind (
+	xp_awk_tab_t* tab, const xp_char_t* value, xp_size_t index);
+
 
 #ifdef __cplusplus
 }