narayana
/
ravi
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

issue #98 print type info for some more ast nodes

Browse Source
pull/168/head
Dibyendu Majumdar 5 years ago
parent 4ad83f8abf
commit 6b5315366a
3 changed files with 103 additions and 103 deletions
Show Stats Download Patch File Download Diff File

124
ravi-tests/ravi_test_ast.expected
Unescape View File

@ -32,7 +32,7 @@ end
function()
return
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --global symbol ?
--[primary end]
--[suffixed expr end]
@ -123,7 +123,7 @@ function()
return
--[binary expr start] number
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[binary expr start] integer
1
+
@ -133,7 +133,7 @@ function()
--[suffixed expr end]
^
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[binary expr start] integer
50
+
@ -151,7 +151,7 @@ function()
return
--[binary expr start] number
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[unary expr start] integer
-
2
@ -160,7 +160,7 @@ function()
--[suffixed expr end]
^
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[binary expr start] integer
31
-
@ -178,7 +178,7 @@ function()
return
--[binary expr start] any
--[suffixed expr start] number
--[primary start]
--[primary start] number
--[binary expr start] number
--[unary expr start] number
-
@ -224,10 +224,10 @@ function()
--[unary expr start] number
-
--[suffixed expr start] number
--[primary start]
--[primary start] number
--[binary expr start] number
--[suffixed expr start] number
--[primary start]
--[primary start] number
--[binary expr start] number
--[binary expr start] number
2.0000000000000000
@ -238,7 +238,7 @@ function()
--[unary expr start] integer
-
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[unary expr start] integer
-
1
@ -277,10 +277,10 @@ function()
--[unary expr start] number
-
--[suffixed expr start] number
--[primary start]
--[primary start] number
--[binary expr start] number
--[suffixed expr start] number
--[primary start]
--[primary start] number
--[binary expr start] number
--[binary expr start] number
2
@ -291,7 +291,7 @@ function()
--[unary expr start] integer
-
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[unary expr start] integer
-
1
@ -347,7 +347,7 @@ function()
--[unary expr start] any
~
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[unary expr start] any
~
@ -385,10 +385,10 @@ function()
return
--[binary expr start] integer
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[binary expr start] integer
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[binary expr start] integer
100
<<
@ -429,7 +429,7 @@ function()
2
^
--[suffixed expr start] number
--[primary start]
--[primary start] number
--[binary expr start] number
3
^
@ -459,7 +459,7 @@ function()
==
--[binary expr start] number
--[suffixed expr start] number
--[primary start]
--[primary start] number
--[binary expr start] number
2
^
@ -544,7 +544,7 @@ function()
--[unary expr start] any
not
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[binary expr start] boolean
2
@ -621,7 +621,7 @@ function()
--[binary expr start] boolean
--[binary expr start] number
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[unary expr start] integer
-
2
@ -743,7 +743,7 @@ function()
--[unary expr start] any
not
--[suffixed expr start] boolean
--[primary start]
--[primary start] boolean
--[binary expr start] boolean
--[binary expr start] integer
2
@ -979,7 +979,7 @@ function()
--[binary expr start] any
--[binary expr start] any
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[unary expr start] integer
-
3
@ -988,13 +988,13 @@ function()
--[suffixed expr end]
+
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[binary expr start] integer
4
*
@ -1004,12 +1004,12 @@ function()
--[suffixed expr end]
//
--[suffixed expr start] number
--[primary start]
--[primary start] number
--[binary expr start] number
2
^
--[suffixed expr start] number
--[primary start]
--[primary start] number
--[binary expr start] number
3
^
@ -1031,10 +1031,10 @@ function()
--[binary expr end]
+
--[suffixed expr start] number
--[primary start]
--[primary start] number
--[binary expr start] number
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
--[binary expr start] integer
4
%
@ -1059,10 +1059,10 @@ function()
--[unary expr start] any
not
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
true
or
@ -1101,13 +1101,13 @@ function()
return
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
1
or
@ -1137,13 +1137,13 @@ function()
return
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
nil
and
@ -1176,7 +1176,7 @@ function()
--[unary expr start] any
-
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
1
or
@ -1195,7 +1195,7 @@ function()
--[binary expr start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
1
and
@ -1205,7 +1205,7 @@ function()
--[suffixed expr end]
+
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[unary expr start] number
-
@ -1235,16 +1235,16 @@ function()
--[binary expr start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
b --global symbol ?
--[primary end]
--[suffixed expr end]
or
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --global symbol ?
--[primary end]
--[suffixed expr end]
@ -1261,12 +1261,12 @@ function()
--[binary expr start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
10
or
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --global symbol ?
--[primary end]
--[suffixed expr end]
@ -1290,10 +1290,10 @@ function()
--[binary expr start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] boolean
--[primary start]
--[primary start] boolean
--[binary expr start] boolean
2
<
@ -1312,7 +1312,7 @@ function()
and
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[binary expr start] boolean
2
@ -1338,16 +1338,16 @@ function()
--[binary expr start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
x --global symbol ?
--[primary end]
--[suffixed expr end]
>
--[suffixed expr start] any
--[primary start]
--[primary start] any
y --global symbol ?
--[primary end]
--[suffixed expr end]
@ -1356,7 +1356,7 @@ function()
--[suffixed expr end]
and
--[suffixed expr start] any
--[primary start]
--[primary start] any
x --global symbol ?
--[primary end]
--[suffixed expr end]
@ -1364,7 +1364,7 @@ function()
or
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
y --global symbol ?
--[primary end]
--[suffixed expr end]
@ -1382,16 +1382,16 @@ function()
--[binary expr start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
x --global symbol ?
--[primary end]
--[suffixed expr end]
>
--[suffixed expr start] any
--[primary start]
--[primary start] any
y --global symbol ?
--[primary end]
--[suffixed expr end]
@ -1400,7 +1400,7 @@ function()
--[suffixed expr end]
and
--[suffixed expr start] any
--[primary start]
--[primary start] any
x --global symbol ?
--[primary end]
--[suffixed expr end]
@ -1408,7 +1408,7 @@ function()
or
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
y --global symbol ?
--[primary end]
--[suffixed expr end]
@ -1436,14 +1436,14 @@ function()
--[expression statement start]
--[expression list start]
--[suffixed expr start] any
--[primary start]
--[primary start] any
print --global symbol ?
--[primary end]
--[suffix list start]
--[function call start]
--[function call start] any
(
--[suffixed expr start] any
--[primary start]
--[primary start] any
i --local symbol ?
--[primary end]
--[suffixed expr end]
@ -1479,7 +1479,7 @@ function()
--upvalues a
return
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --upvalue ?
--[primary end]
--[suffixed expr end]
@ -1577,7 +1577,7 @@ function()
--[unary expr start] User.Type
@<usertype>
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --global symbol ?
--[primary end]
--[suffixed expr end]

76
ravi-tests/ravi_test_ast2.expected
Unescape View File

@ -18,7 +18,7 @@ function()
--upvalues a
return
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --upvalue ?
--[primary end]
--[suffixed expr end]
@ -40,7 +40,7 @@ function()
--upvalues a
return
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --upvalue ?
--[primary end]
--[suffixed expr end]
@ -48,13 +48,13 @@ function()
end
return
--[suffixed expr start] closure
--[primary start]
--[primary start] closure
y --local symbol function
--[primary end]
--[suffixed expr end]
,
--[suffixed expr start] closure
--[primary start]
--[primary start] closure
z --local symbol function
--[primary end]
--[suffixed expr end]
@ -78,13 +78,13 @@ function()
if
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --local symbol ?
--[primary end]
--[suffixed expr end]
==
--[suffixed expr start] any
--[primary start]
--[primary start] any
b --local symbol ?
--[primary end]
--[suffixed expr end]
@ -94,13 +94,13 @@ function()
elseif
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --local symbol ?
--[primary end]
--[suffixed expr end]
==
--[suffixed expr start] any
--[primary start]
--[primary start] any
c --local symbol ?
--[primary end]
--[suffixed expr end]
@ -110,13 +110,13 @@ function()
elseif
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --local symbol ?
--[primary end]
--[suffixed expr end]
==
--[suffixed expr start] any
--[primary start]
--[primary start] any
d --local symbol ?
--[primary end]
--[suffixed expr end]
@ -127,13 +127,13 @@ function()
if
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --local symbol ?
--[primary end]
--[suffixed expr end]
==
--[suffixed expr start] any
--[primary start]
--[primary start] any
e --local symbol ?
--[primary end]
--[suffixed expr end]
@ -160,7 +160,7 @@ function()
while
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --local symbol ?
--[primary end]
--[suffixed expr end]
@ -171,7 +171,7 @@ function()
--[expression statement start]
--[var list start]
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --local symbol ?
--[primary end]
--[suffixed expr end]
@ -179,7 +179,7 @@ function()
--[expression list start]
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --local symbol ?
--[primary end]
--[suffixed expr end]
@ -203,10 +203,10 @@ function()
--[unary expr start] any
not
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --local symbol ?
--[primary end]
--[suffixed expr end]
@ -222,7 +222,7 @@ function()
--[expression statement start]
--[var list start]
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --local symbol ?
--[primary end]
--[suffixed expr end]
@ -230,7 +230,7 @@ function()
--[expression list start]
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
a --local symbol ?
--[primary end]
--[suffixed expr end]
@ -250,22 +250,22 @@ function()
--[expression statement start]
--[expression list start]
--[suffixed expr start] any
--[primary start]
--[primary start] closure
function()
end
--[primary end]
--[suffix list start]
--[function call start]
--[function call start] any
(
{ --[table constructor start] table
--[indexed assign start]
--[indexed assign start] any
--[value start]
--[suffixed expr start] any
--[primary start]
--[primary start] any
f --global symbol ?
--[primary end]
--[suffix list start]
--[function call start]
--[function call start] any
(
)
--[function call end]
@ -300,7 +300,7 @@ function()
--[expression statement start]
--[var list start]
--[suffixed expr start] any
--[primary start]
--[primary start] any
sum --local symbol ?
--[primary end]
--[suffixed expr end]
@ -319,7 +319,7 @@ function()
--[expression statement start]
--[var list start]
--[suffixed expr start] any
--[primary start]
--[primary start] any
sum --local symbol ?
--[primary end]
--[suffixed expr end]
@ -327,7 +327,7 @@ function()
--[expression list start]
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
sum --local symbol ?
--[primary end]
--[suffixed expr end]
@ -336,16 +336,16 @@ function()
1.0000000000000000
/
--[suffixed expr start] any
--[primary start]
--[primary start] any
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
--[primary start] any
k --local symbol ?
--[primary end]
--[suffixed expr end]
*
--[suffixed expr start] any
--[primary start]
--[primary start] any
k --local symbol ?
--[primary end]
--[suffixed expr end]
@ -360,7 +360,7 @@ function()
end
return
--[suffixed expr start] any
--[primary start]
--[primary start] any
sum --local symbol ?
--[primary end]
--[suffixed expr end]
@ -375,7 +375,7 @@ function()
return
--[binary expr start] integer
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
a --local symbol integer
--[primary end]
--[suffixed expr end]
@ -391,7 +391,7 @@ function()
i --local symbol integer
return
--[suffixed expr start] any
--[primary start]
--[primary start] any
t --global symbol ?
--[primary end]
--[suffix list start]
@ -399,7 +399,7 @@ function()
[
--[binary expr start] number
--[suffixed expr start] integer
--[primary start]
--[primary start] integer
i --local symbol integer
--[primary end]
--[suffixed expr end]
@ -419,7 +419,7 @@ function()
t --local symbol integer[]
return
--[suffixed expr start] integer
--[primary start]
--[primary start] integer[]
t --local symbol integer[]
--[primary end]
--[suffix list start]
@ -435,11 +435,11 @@ end
function()
return
--[suffixed expr start] any
--[primary start]
--[primary start] any
f --global symbol ?
--[primary end]
--[suffix list start]
--[function call start]
--[function call start] any
(
)
--[function call end]
@ -455,7 +455,7 @@ end
function()
return
--[suffixed expr start] any
--[primary start]
--[primary start] any
x --global symbol ?
--[primary end]
--[suffix list start]

6
src/ravi_ast_print.c
Unescape View File

@ -407,7 +407,7 @@ void raviA_print_ast_node(membuff_t *buf, struct ast_node *node, int level) {
}
case AST_SUFFIXED_EXPR: {
printf_buf(buf, "%p%c %T\n", level, "[suffixed expr start]", &node->suffixed_expr.type);
printf_buf(buf, "%p%c\n", level+1, "[primary start]");
printf_buf(buf, "%p%c %T\n", level+1, "[primary start]", &node->suffixed_expr.primary_expr->common_expr.type);
raviA_print_ast_node(buf, node->suffixed_expr.primary_expr, level + 2);
printf_buf(buf, "%p%c\n", level+1, "[primary end]");
if (node->suffixed_expr.suffix_list) {
@ -419,7 +419,7 @@ void raviA_print_ast_node(membuff_t *buf, struct ast_node *node, int level) {
break;
}
case AST_FUNCTION_CALL_EXPR: {
printf_buf(buf, "%p%c\n", level, "[function call start]");
printf_buf(buf, "%p%c %T\n", level, "[function call start]", &node->function_call_expr.type);
if (node->function_call_expr.method_name) {
printf_buf(buf, "%p: %t (\n", level + 1, node->function_call_expr.method_name);
}
@ -490,7 +490,7 @@ void raviA_print_ast_node(membuff_t *buf, struct ast_node *node, int level) {
break;
}
case AST_INDEXED_ASSIGN_EXPR: {
printf_buf(buf, "%p%c\n", level, "[indexed assign start]");
printf_buf(buf, "%p%c %T\n", level, "[indexed assign start]", &node->indexed_assign_expr.type);
if (node->indexed_assign_expr.index_expr) {
printf_buf(buf, "%p%c\n", level, "[index start]");
raviA_print_ast_node(buf, node->indexed_assign_expr.index_expr, level + 1);

Write Preview
Loading…
Cancel
Save