*** empty log message ***
This commit is contained in:
parent
2ea1efedcf
commit
5fc64d4b13
213
ase/awk/parse.c
213
ase/awk/parse.c
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* $Id: parse.c,v 1.15 2006-01-12 12:30:29 bacon Exp $
|
* $Id: parse.c,v 1.16 2006-01-12 14:20:17 bacon Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <xp/awk/awk.h>
|
#include <xp/awk/awk.h>
|
||||||
@ -58,6 +58,23 @@ enum
|
|||||||
TOKEN_NEXTFILE
|
TOKEN_NEXTFILE
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum {
|
||||||
|
BINOP_PLUS,
|
||||||
|
BINOP_MINUS,
|
||||||
|
BINOP_MUL,
|
||||||
|
BINOP_DIV,
|
||||||
|
BINOP_MOD
|
||||||
|
};
|
||||||
|
|
||||||
|
static xp_char_t __binop_char[] =
|
||||||
|
{
|
||||||
|
XP_CHAR('+'),
|
||||||
|
XP_CHAR('-'),
|
||||||
|
XP_CHAR('*'),
|
||||||
|
XP_CHAR('/'),
|
||||||
|
XP_CHAR('%')
|
||||||
|
};
|
||||||
|
|
||||||
static xp_awk_node_t* __parse_program (xp_awk_t* awk);
|
static xp_awk_node_t* __parse_program (xp_awk_t* awk);
|
||||||
static xp_awk_node_t* __parse_funcdcl (xp_awk_t* awk);
|
static xp_awk_node_t* __parse_funcdcl (xp_awk_t* awk);
|
||||||
static xp_awk_node_t* __parse_patnact (xp_awk_t* awk);
|
static xp_awk_node_t* __parse_patnact (xp_awk_t* awk);
|
||||||
@ -65,7 +82,7 @@ static xp_awk_node_t* __parse_block (xp_awk_t* awk);
|
|||||||
static xp_awk_node_t* __parse_stat (xp_awk_t* awk);
|
static xp_awk_node_t* __parse_stat (xp_awk_t* awk);
|
||||||
static xp_awk_node_t* __parse_expr (xp_awk_t* awk);
|
static xp_awk_node_t* __parse_expr (xp_awk_t* awk);
|
||||||
static xp_awk_node_t* __parse_assignment (xp_awk_t* awk, xp_char_t* ident);
|
static xp_awk_node_t* __parse_assignment (xp_awk_t* awk, xp_char_t* ident);
|
||||||
static xp_awk_node_t* __parse_basic_expr (xp_awk_t* awk, const xp_char_t* ident);
|
static xp_awk_node_t* __parse_basic_expr (xp_awk_t* awk, xp_char_t* ident);
|
||||||
static xp_awk_node_t* __parse_additive (xp_awk_t* awk);
|
static xp_awk_node_t* __parse_additive (xp_awk_t* awk);
|
||||||
static xp_awk_node_t* __parse_multiplicative (xp_awk_t* awk);
|
static xp_awk_node_t* __parse_multiplicative (xp_awk_t* awk);
|
||||||
static xp_awk_node_t* __parse_unary (xp_awk_t* awk);
|
static xp_awk_node_t* __parse_unary (xp_awk_t* awk);
|
||||||
@ -120,13 +137,13 @@ static struct __kwent __kwtab[] =
|
|||||||
#define SET_TOKEN_TYPE(awk,code) ((awk)->token.type = code)
|
#define SET_TOKEN_TYPE(awk,code) ((awk)->token.type = code)
|
||||||
|
|
||||||
#define ADD_TOKEN_CHAR(awk,c) do { \
|
#define ADD_TOKEN_CHAR(awk,c) do { \
|
||||||
if (xp_str_ccat(&(awk)->token.name,(c)) == -1) { \
|
if (xp_str_ccat(&(awk)->token.name,(c)) == (xp_size_t)-1) { \
|
||||||
(awk)->errnum = XP_AWK_ENOMEM; return -1; \
|
(awk)->errnum = XP_AWK_ENOMEM; return -1; \
|
||||||
} \
|
} \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
#define ADD_TOKEN_STR(awk,str) do { \
|
#define ADD_TOKEN_STR(awk,str) do { \
|
||||||
if (xp_str_cat(&(awk)->token.name,(str)) == -1) { \
|
if (xp_str_cat(&(awk)->token.name,(str)) == (xp_size_t)-1) { \
|
||||||
(awk)->errnum = XP_AWK_ENOMEM; return -1; \
|
(awk)->errnum = XP_AWK_ENOMEM; return -1; \
|
||||||
} \
|
} \
|
||||||
} while (0)
|
} while (0)
|
||||||
@ -176,13 +193,23 @@ void __print_parse_tree (xp_awk_node_t* tree, int depth)
|
|||||||
xp_printf (XP_TEXT(";\n"));
|
xp_printf (XP_TEXT(";\n"));
|
||||||
}
|
}
|
||||||
else if (p->type == XP_AWK_NODE_BINARY) {
|
else if (p->type == XP_AWK_NODE_BINARY) {
|
||||||
xp_printf (XP_TEXT("binary basic expression\n"));
|
xp_printf (XP_TEXT("("));
|
||||||
|
__print_parse_tree (((xp_awk_node_expr_t*)p)->left, 0);
|
||||||
|
xp_printf (XP_TEXT(" %c "), __binop_char[((xp_awk_node_expr_t*)p)->opcode]);
|
||||||
|
__print_parse_tree (((xp_awk_node_expr_t*)p)->right, 0);
|
||||||
|
xp_printf (XP_TEXT(")"));
|
||||||
}
|
}
|
||||||
else if (p->type == XP_AWK_NODE_UNARY) {
|
else if (p->type == XP_AWK_NODE_UNARY) {
|
||||||
xp_printf (XP_TEXT("unary basic expression\n"));
|
xp_printf (XP_TEXT("unary basic expression\n"));
|
||||||
}
|
}
|
||||||
else if (p->type == XP_AWK_NODE_STR) {
|
else if (p->type == XP_AWK_NODE_STR) {
|
||||||
xp_printf (XP_TEXT("\"%s\""), ((xp_awk_node_str_t*)p)->value);
|
xp_printf (XP_TEXT("\"%s\""), ((xp_awk_node_term_t*)p)->value);
|
||||||
|
}
|
||||||
|
else if (p->type == XP_AWK_NODE_NUM) {
|
||||||
|
xp_printf (XP_TEXT("%s"), ((xp_awk_node_term_t*)p)->value);
|
||||||
|
}
|
||||||
|
else if (p->type == XP_AWK_NODE_VAR) {
|
||||||
|
xp_printf (XP_TEXT("%s"), ((xp_awk_node_term_t*)p)->value);
|
||||||
}
|
}
|
||||||
|
|
||||||
p = p->next;
|
p = p->next;
|
||||||
@ -284,9 +311,7 @@ static xp_awk_node_t* __parse_block (xp_awk_t* awk)
|
|||||||
{
|
{
|
||||||
xp_awk_node_block_t* blk;
|
xp_awk_node_block_t* blk;
|
||||||
xp_awk_node_t* node, * prev;
|
xp_awk_node_t* node, * prev;
|
||||||
int saved_token;
|
|
||||||
|
|
||||||
xp_printf (XP_TEXT("__parse_block....\n"));
|
|
||||||
blk = (xp_awk_node_block_t*) xp_malloc (xp_sizeof(xp_awk_node_block_t));
|
blk = (xp_awk_node_block_t*) xp_malloc (xp_sizeof(xp_awk_node_block_t));
|
||||||
if (blk == XP_NULL) {
|
if (blk == XP_NULL) {
|
||||||
/* TODO: do some clean-up */
|
/* TODO: do some clean-up */
|
||||||
@ -298,8 +323,6 @@ xp_printf (XP_TEXT("__parse_block....\n"));
|
|||||||
blk->body = prev = XP_NULL;
|
blk->body = prev = XP_NULL;
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
saved_token = awk->token.type;
|
|
||||||
|
|
||||||
if (MATCH(awk,TOKEN_EOF)) {
|
if (MATCH(awk,TOKEN_EOF)) {
|
||||||
/* TODO: do come clean-up */
|
/* TODO: do come clean-up */
|
||||||
PANIC (awk, XP_AWK_EENDSRC);
|
PANIC (awk, XP_AWK_EENDSRC);
|
||||||
@ -311,7 +334,6 @@ xp_printf (XP_TEXT("__parse_block....\n"));
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (MATCH(awk, TOKEN_SEMICOLON)) {
|
if (MATCH(awk, TOKEN_SEMICOLON)) {
|
||||||
/* null statement */
|
/* null statement */
|
||||||
CONSUME (awk);
|
CONSUME (awk);
|
||||||
@ -325,14 +347,11 @@ xp_printf (XP_TEXT("__parse_block....\n"));
|
|||||||
}
|
}
|
||||||
else node = __parse_stat (awk);
|
else node = __parse_stat (awk);
|
||||||
|
|
||||||
if (node != NULL) print_parse_tree (node);
|
|
||||||
|
|
||||||
if (node == XP_NULL) return XP_NULL;
|
if (node == XP_NULL) return XP_NULL;
|
||||||
|
|
||||||
if (prev == XP_NULL) blk->body = node;
|
if (prev == XP_NULL) blk->body = node;
|
||||||
else prev->next = node;
|
else prev->next = node;
|
||||||
prev = node;
|
prev = node;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (xp_awk_node_t*)blk;
|
return (xp_awk_node_t*)blk;
|
||||||
@ -417,7 +436,6 @@ static xp_awk_node_t* __parse_expr (xp_awk_t* awk)
|
|||||||
*/
|
*/
|
||||||
xp_awk_node_t* x;
|
xp_awk_node_t* x;
|
||||||
|
|
||||||
xp_printf (XP_TEXT("parse_expr.......................\n"));
|
|
||||||
if (MATCH(awk,TOKEN_IDENT)) {
|
if (MATCH(awk,TOKEN_IDENT)) {
|
||||||
// TODO: use a different approach later...
|
// TODO: use a different approach later...
|
||||||
xp_char_t* ident = xp_strdup (XP_STR_BUF(&awk->token.name));
|
xp_char_t* ident = xp_strdup (XP_STR_BUF(&awk->token.name));
|
||||||
@ -426,11 +444,9 @@ xp_printf (XP_TEXT("parse_expr.......................\n"));
|
|||||||
PANIC (awk, XP_AWK_ENOMEM);
|
PANIC (awk, XP_AWK_ENOMEM);
|
||||||
}
|
}
|
||||||
|
|
||||||
xp_printf (XP_TEXT("parse_expr 1111111111111111111111111111.......................\n"));
|
|
||||||
CONSUME (awk);
|
CONSUME (awk);
|
||||||
if (MATCH(awk,TOKEN_ASSIGN)) {
|
if (MATCH(awk,TOKEN_ASSIGN)) {
|
||||||
CONSUME (awk);
|
CONSUME (awk);
|
||||||
xp_printf (XP_TEXT("parse_expr 22222222222222222222222222222222.......................\n"));
|
|
||||||
x = __parse_assignment(awk, ident);
|
x = __parse_assignment(awk, ident);
|
||||||
}
|
}
|
||||||
else x = __parse_basic_expr (awk, ident);
|
else x = __parse_basic_expr (awk, ident);
|
||||||
@ -439,6 +455,7 @@ xp_printf (XP_TEXT("parse_expr 22222222222222222222222222222222.................
|
|||||||
return x; // TODO: anything to clearn when x is XP_NULL????
|
return x; // TODO: anything to clearn when x is XP_NULL????
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: maybe this shoudl be an error ->>> just an expression without assignment */
|
||||||
return __parse_basic_expr (awk, XP_NULL);
|
return __parse_basic_expr (awk, XP_NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -450,19 +467,15 @@ static xp_awk_node_t* __parse_assignment (xp_awk_t* awk, xp_char_t* ident)
|
|||||||
|
|
||||||
xp_assert (ident != XP_NULL);
|
xp_assert (ident != XP_NULL);
|
||||||
|
|
||||||
xp_printf (XP_TEXT("__parse_assignment starting for %s\n"), ident);
|
|
||||||
node = (xp_awk_node_assign_t*)xp_malloc (xp_sizeof(xp_awk_node_assign_t));
|
node = (xp_awk_node_assign_t*)xp_malloc (xp_sizeof(xp_awk_node_assign_t));
|
||||||
xp_printf (XP_TEXT("__parse_assignment xxxxxxxxxxxxxxxxxxxxxxx %s\n"), ident);
|
|
||||||
if (node == XP_NULL) PANIC (awk, XP_AWK_ENOMEM);
|
if (node == XP_NULL) PANIC (awk, XP_AWK_ENOMEM);
|
||||||
|
|
||||||
xp_printf (XP_TEXT("__parse_assignment duplicating string... %s\n"), ident);
|
|
||||||
idtdup = xp_strdup (ident);
|
idtdup = xp_strdup (ident);
|
||||||
if (idtdup == XP_NULL) {
|
if (idtdup == XP_NULL) {
|
||||||
xp_free (node);
|
xp_free (node);
|
||||||
PANIC (awk, XP_AWK_ENOMEM);
|
PANIC (awk, XP_AWK_ENOMEM);
|
||||||
}
|
}
|
||||||
|
|
||||||
xp_printf (XP_TEXT("__parse_assignment for %s\n"), ident);
|
|
||||||
value = __parse_basic_expr (awk, XP_NULL);
|
value = __parse_basic_expr (awk, XP_NULL);
|
||||||
if (value == XP_NULL) {
|
if (value == XP_NULL) {
|
||||||
xp_free (idtdup);
|
xp_free (idtdup);
|
||||||
@ -478,7 +491,7 @@ xp_printf (XP_TEXT("__parse_assignment for %s\n"), ident);
|
|||||||
return (xp_awk_node_t*)node;
|
return (xp_awk_node_t*)node;
|
||||||
}
|
}
|
||||||
|
|
||||||
static xp_awk_node_t* __parse_basic_expr (xp_awk_t* awk, const xp_char_t* ident)
|
static xp_awk_node_t* __parse_basic_expr (xp_awk_t* awk, xp_char_t* ident)
|
||||||
{
|
{
|
||||||
/* <basic expression> ::= <additive>
|
/* <basic expression> ::= <additive>
|
||||||
* <additive> ::= <multiplicative> [additiveOp <multiplicative>]*
|
* <additive> ::= <multiplicative> [additiveOp <multiplicative>]*
|
||||||
@ -492,54 +505,90 @@ static xp_awk_node_t* __parse_basic_expr (xp_awk_t* awk, const xp_char_t* ident)
|
|||||||
return __parse_additive (awk);
|
return __parse_additive (awk);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static xp_awk_node_t* __parse_additive (xp_awk_t* awk)
|
static xp_awk_node_t* __parse_additive (xp_awk_t* awk)
|
||||||
{
|
{
|
||||||
xp_awk_node_t* top, * left, * right;
|
xp_awk_node_expr_t* node;
|
||||||
|
xp_awk_node_t* left, * right;
|
||||||
|
int opcode;
|
||||||
|
|
||||||
/*
|
|
||||||
left = __parse_multiplicative (awk);
|
left = __parse_multiplicative (awk);
|
||||||
if (left == XP_NULL) return XP_NULL;
|
if (left == XP_NULL) return XP_NULL;
|
||||||
|
|
||||||
while (MATCH(awk,TOKEN_MUL) ||
|
while (1) {
|
||||||
MATCH(awk,TOKEN_DIV) ||
|
if (MATCH(awk,TOKEN_PLUS)) opcode = BINOP_PLUS;
|
||||||
MATCH(awk,TOKEN_MOD)) {
|
else if (MATCH(awk,TOKEN_MINUS)) opcode = BINOP_MINUS;
|
||||||
|
else break;
|
||||||
|
|
||||||
CONSUME (awk);
|
if (__get_token(awk) == -1) {
|
||||||
right = __parse_multiplicative (awk);
|
// TODO: cleanup left...
|
||||||
if (right == XP_NULL) {
|
|
||||||
// TODO: memory clean-up
|
|
||||||
return XP_NULL;
|
return XP_NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
right = __parse_multiplicative (awk);
|
||||||
|
if (right == XP_NULL) {
|
||||||
|
// TOOD: cleanup left if necessary
|
||||||
|
return XP_NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return top;
|
node = (xp_awk_node_expr_t*)xp_malloc(xp_sizeof(xp_awk_node_expr_t));
|
||||||
*/
|
if (node == XP_NULL) {
|
||||||
return __parse_multiplicative (awk);
|
// TODO: cleanup previous tmp (maybe current left) if necessary
|
||||||
|
// TOOD: cleanup left if necessary
|
||||||
|
PANIC (awk, XP_AWK_ENOMEM);
|
||||||
|
}
|
||||||
|
|
||||||
|
node->type = XP_AWK_NODE_BINARY;
|
||||||
|
node->next = XP_NULL;
|
||||||
|
node->opcode = opcode;
|
||||||
|
node->left = left;
|
||||||
|
node->right = right;
|
||||||
|
|
||||||
|
left = (xp_awk_node_t*)node;
|
||||||
|
}
|
||||||
|
|
||||||
|
return left;
|
||||||
}
|
}
|
||||||
|
|
||||||
static xp_awk_node_t* __parse_multiplicative (xp_awk_t* awk)
|
static xp_awk_node_t* __parse_multiplicative (xp_awk_t* awk)
|
||||||
{
|
{
|
||||||
xp_awk_node_t* top, * left, * right;
|
xp_awk_node_expr_t* node;
|
||||||
|
xp_awk_node_t* left, * right;
|
||||||
|
int opcode;
|
||||||
|
|
||||||
/*
|
|
||||||
left = __parse_unary (awk);
|
left = __parse_unary (awk);
|
||||||
if (left == XP_NULL) return XP_NULL;
|
if (left == XP_NULL) return XP_NULL;
|
||||||
|
|
||||||
while (MATCH(awk,TOKEN_MUL) ||
|
while (1) {
|
||||||
MATCH(awk,TOKEN_DIV) ||
|
if (MATCH(awk,TOKEN_MUL)) opcode = BINOP_MUL;
|
||||||
MATCH(awk,TOKEN_MOD)) {
|
else if (MATCH(awk,TOKEN_DIV)) opcode = BINOP_DIV;
|
||||||
|
else if (MATCH(awk,TOKEN_MOD)) opcode = BINOP_MOD;
|
||||||
|
else break;
|
||||||
|
|
||||||
CONSUME (awk);
|
CONSUME (awk);
|
||||||
right = __parse_unary (awk);
|
right = __parse_unary (awk);
|
||||||
if (right == XP_NULL) {
|
if (right == XP_NULL) {
|
||||||
// TODO: memory clean-up
|
// TOOD: cleanup left if necessary
|
||||||
return XP_NULL;
|
return XP_NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
node = (xp_awk_node_expr_t*)xp_malloc(xp_sizeof(xp_awk_node_expr_t));
|
||||||
|
if (node == XP_NULL) {
|
||||||
|
// TODO: cleanup previous tmp (maybe current left) if necessary
|
||||||
|
// TOOD: cleanup left if necessary
|
||||||
|
PANIC (awk, XP_AWK_ENOMEM);
|
||||||
}
|
}
|
||||||
|
|
||||||
return top;
|
node->type = XP_AWK_NODE_BINARY;
|
||||||
*/
|
node->next = XP_NULL;
|
||||||
return __parse_unary (awk);
|
node->opcode = opcode;
|
||||||
|
node->left = left;
|
||||||
|
node->right = right;
|
||||||
|
|
||||||
|
left = (xp_awk_node_t*)node;
|
||||||
|
}
|
||||||
|
|
||||||
|
return left;
|
||||||
}
|
}
|
||||||
|
|
||||||
static xp_awk_node_t* __parse_unary (xp_awk_t* awk)
|
static xp_awk_node_t* __parse_unary (xp_awk_t* awk)
|
||||||
@ -549,38 +598,66 @@ static xp_awk_node_t* __parse_unary (xp_awk_t* awk)
|
|||||||
|
|
||||||
static xp_awk_node_t* __parse_primary (xp_awk_t* awk)
|
static xp_awk_node_t* __parse_primary (xp_awk_t* awk)
|
||||||
{
|
{
|
||||||
|
if (MATCH(awk,TOKEN_INTEGER)) {
|
||||||
/*if (MATCH(awk,TOKEN_INTEGER)) {
|
|
||||||
}
|
|
||||||
else*/ if (MATCH(awk,TOKEN_STRING)) {
|
|
||||||
xp_awk_node_str_t* node;
|
|
||||||
node = (xp_awk_node_str_t*)xp_malloc(xp_sizeof(xp_awk_node_str_t));
|
|
||||||
if (node == XP_NULL) PANIC (awk, XP_AWK_ENOMEM);
|
|
||||||
|
|
||||||
xp_printf (XP_TEXT("found a string token...\n"));
|
|
||||||
node->type = XP_AWK_NODE_STR;
|
|
||||||
node->next = XP_NULL;
|
|
||||||
node->value = xp_strdup(XP_STR_BUF(&awk->token.name));
|
|
||||||
|
|
||||||
xp_printf (XP_TEXT("string node value [%s]\n"), node->value);
|
|
||||||
CONSUME (awk);
|
|
||||||
return (xp_awk_node_t*)node;
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
else if (MATCH(awk,TOKEN_IDENT)) {
|
|
||||||
xp_awk_node_term_t* node;
|
xp_awk_node_term_t* node;
|
||||||
node = (xp_awk_node_term_t*)xp_malloc(xp_sizeof(xp_awk_node_term_t));
|
node = (xp_awk_node_term_t*)xp_malloc(xp_sizeof(xp_awk_node_term_t));
|
||||||
if (node == XP_NULL) PANIC (awk, XP_AWK_ENOMEM);
|
if (node == XP_NULL) PANIC (awk, XP_AWK_ENOMEM);
|
||||||
|
|
||||||
node->type = XP_AWK_NODE_IDT;
|
node->type = XP_AWK_NODE_NUM;
|
||||||
node->next = XP_NULL;
|
node->next = XP_NULL;
|
||||||
node->value = token_value....
|
node->value = xp_strdup(XP_STR_BUF(&awk->token.name));
|
||||||
|
if (node->value == XP_NULL) {
|
||||||
|
xp_free (node);
|
||||||
|
PANIC (awk, XP_AWK_ENOMEM);
|
||||||
|
}
|
||||||
|
|
||||||
CONSUME (awk);
|
CONSUME (awk);
|
||||||
|
return (xp_awk_node_t*)node;
|
||||||
}
|
}
|
||||||
|
else if (MATCH(awk,TOKEN_STRING)) {
|
||||||
|
xp_awk_node_term_t* node;
|
||||||
|
node = (xp_awk_node_term_t*)xp_malloc(xp_sizeof(xp_awk_node_term_t));
|
||||||
|
if (node == XP_NULL) PANIC (awk, XP_AWK_ENOMEM);
|
||||||
|
|
||||||
|
node->type = XP_AWK_NODE_STR;
|
||||||
|
node->next = XP_NULL;
|
||||||
|
node->value = xp_strdup(XP_STR_BUF(&awk->token.name));
|
||||||
|
if (node->value == XP_NULL) {
|
||||||
|
xp_free (node);
|
||||||
|
PANIC (awk, XP_AWK_ENOMEM);
|
||||||
|
}
|
||||||
|
|
||||||
|
CONSUME (awk);
|
||||||
|
return (xp_awk_node_t*)node;
|
||||||
|
}
|
||||||
|
else if (MATCH(awk,TOKEN_IDENT)) {
|
||||||
|
xp_char_t* idtdup;
|
||||||
|
|
||||||
|
idtdup = xp_strdup(XP_STR_BUF(&awk->token.name));
|
||||||
|
if (idtdup == XP_NULL) PANIC (awk, XP_AWK_ENOMEM);
|
||||||
|
|
||||||
|
CONSUME (awk); // error handling... replace it by get_token...
|
||||||
|
if (MATCH(awk,TOKEN_LPAREN)) {
|
||||||
|
/* function call */
|
||||||
|
// TODO:
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
xp_awk_node_term_t* node;
|
||||||
|
|
||||||
|
node = (xp_awk_node_term_t*)xp_malloc(xp_sizeof(xp_awk_node_term_t));
|
||||||
|
if (node == XP_NULL) PANIC (awk, XP_AWK_ENOMEM);
|
||||||
|
|
||||||
|
node->type = XP_AWK_NODE_VAR;
|
||||||
|
node->next = XP_NULL;
|
||||||
|
node->value = idtdup;
|
||||||
|
|
||||||
|
return (xp_awk_node_t*)node;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/*
|
||||||
else if (MATCH(awk,TOKEN_LPAREN)) {
|
else if (MATCH(awk,TOKEN_LPAREN)) {
|
||||||
xp_awk_node_t* tmp;
|
xp_awk_node_t* tmp;
|
||||||
xp_awk_node_term_t* node;
|
xp_awk_node_term_t* node; -> use different type
|
||||||
|
|
||||||
CONSUME (awk);
|
CONSUME (awk);
|
||||||
tmp = __parse_expr (awk);
|
tmp = __parse_expr (awk);
|
||||||
@ -703,9 +780,6 @@ static int __get_token (xp_awk_t* awk)
|
|||||||
GET_CHAR_TO (awk, c);
|
GET_CHAR_TO (awk, c);
|
||||||
// TODO: enhance string handling including escaping
|
// TODO: enhance string handling including escaping
|
||||||
}
|
}
|
||||||
else if (c == XP_CHAR('/')) {
|
|
||||||
/* regular expression */
|
|
||||||
}
|
|
||||||
else if (c == XP_CHAR('=')) {
|
else if (c == XP_CHAR('=')) {
|
||||||
GET_CHAR_TO (awk, c);
|
GET_CHAR_TO (awk, c);
|
||||||
if (c == XP_CHAR('=')) {
|
if (c == XP_CHAR('=')) {
|
||||||
@ -776,6 +850,7 @@ static int __get_token (xp_awk_t* awk)
|
|||||||
GET_CHAR_TO (awk, c);
|
GET_CHAR_TO (awk, c);
|
||||||
}
|
}
|
||||||
else if (c == XP_CHAR('/')) {
|
else if (c == XP_CHAR('/')) {
|
||||||
|
// TODO: handle regular expression here... /^pattern$/
|
||||||
SET_TOKEN_TYPE (awk, TOKEN_DIV);
|
SET_TOKEN_TYPE (awk, TOKEN_DIV);
|
||||||
ADD_TOKEN_CHAR (awk, c);
|
ADD_TOKEN_CHAR (awk, c);
|
||||||
GET_CHAR_TO (awk, c);
|
GET_CHAR_TO (awk, c);
|
||||||
@ -894,6 +969,8 @@ static int __skip_comment (xp_awk_t* awk)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (__unget_char(awk, c) == -1) return -1;
|
if (__unget_char(awk, c) == -1) return -1;
|
||||||
|
awk->lex.curc = XP_CHAR('/');
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* $Id: tree.h,v 1.4 2006-01-11 14:03:17 bacon Exp $
|
* $Id: tree.h,v 1.5 2006-01-12 14:20:17 bacon Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _XP_AWK_TREE_H_
|
#ifndef _XP_AWK_TREE_H_
|
||||||
@ -13,14 +13,15 @@ enum
|
|||||||
XP_AWK_NODE_ASSIGN,
|
XP_AWK_NODE_ASSIGN,
|
||||||
XP_AWK_NODE_BINARY,
|
XP_AWK_NODE_BINARY,
|
||||||
XP_AWK_NODE_UNARY,
|
XP_AWK_NODE_UNARY,
|
||||||
XP_AWK_NODE_STR
|
XP_AWK_NODE_STR,
|
||||||
|
XP_AWK_NODE_NUM,
|
||||||
|
XP_AWK_NODE_VAR,
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct xp_awk_node_t xp_awk_node_t;
|
typedef struct xp_awk_node_t xp_awk_node_t;
|
||||||
typedef struct xp_awk_node_block_t xp_awk_node_block_t;
|
typedef struct xp_awk_node_block_t xp_awk_node_block_t;
|
||||||
typedef struct xp_awk_node_assign_t xp_awk_node_assign_t;
|
typedef struct xp_awk_node_assign_t xp_awk_node_assign_t;
|
||||||
typedef struct xp_awk_node_expr_t xp_awk_node_expr_t;
|
typedef struct xp_awk_node_expr_t xp_awk_node_expr_t;
|
||||||
typedef struct xp_awk_node_str_t xp_awk_node_str_t;
|
|
||||||
typedef struct xp_awk_node_term_t xp_awk_node_term_t;
|
typedef struct xp_awk_node_term_t xp_awk_node_term_t;
|
||||||
typedef struct xp_awk_node_if_t xp_awk_node_if_t;
|
typedef struct xp_awk_node_if_t xp_awk_node_if_t;
|
||||||
typedef struct xp_awk_node_while_t xp_awk_node_while_t;
|
typedef struct xp_awk_node_while_t xp_awk_node_while_t;
|
||||||
@ -63,16 +64,10 @@ struct xp_awk_node_expr_t
|
|||||||
xp_awk_node_t* right;
|
xp_awk_node_t* right;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct xp_awk_node_str_t
|
|
||||||
{
|
|
||||||
XP_AWK_NODE_HDR;
|
|
||||||
xp_char_t* value;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct xp_awk_node_term_t
|
struct xp_awk_node_term_t
|
||||||
{
|
{
|
||||||
XP_AWK_NODE_HDR;
|
XP_AWK_NODE_HDR;
|
||||||
xp_awk_node_t* value;
|
xp_char_t* value;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct xp_awk_node_if_t
|
struct xp_awk_node_if_t
|
||||||
|
Loading…
Reference in New Issue
Block a user