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

issue #98 start to implement suffixed expr typechecks

Browse Source
pull/168/head
Dibyendu Majumdar 5 years ago
parent b2120b97cc
commit cf7f4b33c0
5 changed files with 784 additions and 490 deletions
Show Stats Download Patch File Download Diff File

870
ravi-tests/ravi_test_ast.expected
View File

File diff suppressed because it is too large Load Diff

362
ravi-tests/ravi_test_ast2.expected
Unescape View File

@ -17,9 +17,11 @@ function()
function()
--upvalues a
return
--[primary start]
a --upvalue ?
--[primary end]
--[suffixed expr start] any
--[primary start]
a --upvalue ?
--[primary end]
--[suffixed expr end]
end
end
local
@ -37,19 +39,25 @@ function()
function()
--upvalues a
return
--[primary start]
a --upvalue ?
--[primary end]
--[suffixed expr start] any
--[primary start]
a --upvalue ?
--[primary end]
--[suffixed expr end]
end
end
return
--[primary start]
y --local symbol function
--[primary end]
--[suffixed expr start] closure
--[primary start]
y --local symbol function
--[primary end]
--[suffixed expr end]
,
--[primary start]
z --local symbol function
--[primary end]
--[suffixed expr start] closure
--[primary start]
z --local symbol function
--[primary end]
--[suffixed expr end]
end
end
@ -69,50 +77,66 @@ function()
--locals a, b, c, d, e
if
--[binary expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr end]
==
--[primary start]
b --local symbol ?
--[primary end]
--[suffixed expr start] any
--[primary start]
b --local symbol ?
--[primary end]
--[suffixed expr end]
--[binary expr end]
then
goto l1
elseif
--[binary expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr end]
==
--[primary start]
c --local symbol ?
--[primary end]
--[suffixed expr start] any
--[primary start]
c --local symbol ?
--[primary end]
--[suffixed expr end]
--[binary expr end]
then
goto l2
elseif
--[binary expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr end]
==
--[primary start]
d --local symbol ?
--[primary end]
--[suffixed expr start] any
--[primary start]
d --local symbol ?
--[primary end]
--[suffixed expr end]
--[binary expr end]
then
goto l2
else
if
--[binary expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr end]
==
--[primary start]
e --local symbol ?
--[primary end]
--[suffixed expr start] any
--[primary start]
e --local symbol ?
--[primary end]
--[suffixed expr end]
--[binary expr end]
then
goto l3
@ -135,24 +159,30 @@ function()
--locals a
while
--[binary expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr end]
<
10
--[binary expr end]
do
--[expression statement start]
--[var list start]
--[primary start]
a --local symbol ?
--[primary end]
= --[var list end]
--[expression list start]
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr end]
= --[var list end]
--[expression list start]
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr end]
+
1
--[binary expr end]
@ -172,30 +202,38 @@ function()
if
--[unary expr start] any
not
--[primary start]
--[binary expr start] any
--[primary start]
a --local symbol ?
--[primary end]
<
10
--[binary expr end]
--[primary end]
--[suffixed expr start] any
--[primary start]
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr end]
<
10
--[binary expr end]
--[primary end]
--[suffixed expr end]
--[unary expr end]
then
goto L1
end
--[expression statement start]
--[var list start]
--[primary start]
a --local symbol ?
--[primary end]
= --[var list end]
--[expression list start]
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr end]
= --[var list end]
--[expression list start]
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
a --local symbol ?
--[primary end]
--[suffixed expr end]
+
1
--[binary expr end]
@ -211,31 +249,35 @@ function()
function()
--[expression statement start]
--[expression list start]
--[primary start]
function()
end
--[primary end]
--[suffix list start]
--[function call start]
(
{ --[table constructor start] table
--[indexed assign start]
--[value start]
--[primary start]
f --global symbol ?
--[primary end]
--[suffix list start]
--[function call start]
(
)
--[function call end]
--[suffix list end]
--[value end]
--[indexed assign end]
} --[table constructor end]
)
--[function call end]
--[suffix list end]
--[suffixed expr start] closure
--[primary start]
function()
end
--[primary end]
--[suffix list start]
--[function call start]
(
{ --[table constructor start] table
--[indexed assign start]
--[value start]
--[suffixed expr start] any
--[primary start]
f --global symbol ?
--[primary end]
--[suffix list start]
--[function call start]
(
)
--[function call end]
--[suffix list end]
--[suffixed expr end]
--[value end]
--[indexed assign end]
} --[table constructor end]
)
--[function call end]
--[suffix list end]
--[suffixed expr end]
--[expression list end]
--[expression statement end]
end
@ -257,9 +299,11 @@ function()
do
--[expression statement start]
--[var list start]
--[primary start]
sum --local symbol ?
--[primary end]
--[suffixed expr start] any
--[primary start]
sum --local symbol ?
--[primary end]
--[suffixed expr end]
= --[var list end]
--[expression list start]
0.0000000000000000
@ -274,30 +318,40 @@ function()
do
--[expression statement start]
--[var list start]
--[primary start]
sum --local symbol ?
--[primary end]
= --[var list end]
--[expression list start]
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
sum --local symbol ?
--[primary end]
--[suffixed expr end]
= --[var list end]
--[expression list start]
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
sum --local symbol ?
--[primary end]
--[suffixed expr end]
+
--[binary expr start] any
1.0000000000000000
/
--[primary start]
--[binary expr start] any
--[primary start]
k --local symbol ?
--[primary end]
*
--[primary start]
k --local symbol ?
--[primary end]
--[binary expr end]
--[primary end]
--[suffixed expr start] any
--[primary start]
--[binary expr start] any
--[suffixed expr start] any
--[primary start]
k --local symbol ?
--[primary end]
--[suffixed expr end]
*
--[suffixed expr start] any
--[primary start]
k --local symbol ?
--[primary end]
--[suffixed expr end]
--[binary expr end]
--[primary end]
--[suffixed expr end]
--[binary expr end]
--[binary expr end]
--[expression list end]
@ -305,9 +359,101 @@ function()
end
end
return
--[primary start]
sum --local symbol ?
--[primary end]
--[suffixed expr start] any
--[primary start]
sum --local symbol ?
--[primary end]
--[suffixed expr end]
end
end
function()
--locals a
local
--[symbols]
a --local symbol integer
return
--[binary expr start] integer
--[suffixed expr start] integer
--[primary start]
a --local symbol integer
--[primary end]
--[suffixed expr end]
+
3
--[binary expr end]
end
function()
--locals i
local
--[symbols]
i --local symbol integer
return
--[suffixed expr start] any
--[primary start]
t --global symbol ?
--[primary end]
--[suffix list start]
--[Y index start] any
[
--[binary expr start] number
--[suffixed expr start] integer
--[primary start]
i --local symbol integer
--[primary end]
--[suffixed expr end]
/
5
--[binary expr end]
]
--[Y index end]
--[suffix list end]
--[suffixed expr end]
end
function()
--locals t
local
--[symbols]
t --local symbol integer[]
return
--[suffixed expr start] any
--[primary start]
t --local symbol integer[]
--[primary end]
--[suffix list start]
--[Y index start] any
[
0
]
--[Y index end]
--[Y index start] any
[
1
]
--[Y index end]
--[suffix list end]
--[suffixed expr end]
end
function()
return
--[suffixed expr start] any
--[primary start]
f --global symbol ?
--[primary end]
--[suffix list start]
--[function call start]
(
)
--[function call end]
--[Y index start] any
[
1
]
--[Y index end]
--[suffix list end]
--[suffixed expr end]
end

20
ravi-tests/ravi_test_ast2.lua
Unescape View File

@ -73,4 +73,24 @@ str=
return sum
end
]]
doast(str)
str=
[[local a: integer return a+3
]]
doast(str)
str=
[[local i: integer; return t[i/5]
]]
doast(str)
str=
[[local t: integer[]; return t[0][1]
]]
doast(str)
str=
[[return f()[1]
]]
doast(str)

18
src/ravi_ast_print.c
Unescape View File

@ -406,14 +406,16 @@ void raviA_print_ast_node(membuff_t *buf, struct ast_node *node, int level) {
break;
}
case AST_SUFFIXED_EXPR: {
printf_buf(buf, "%p%c\n", level, "[primary start]");
raviA_print_ast_node(buf, node->suffixed_expr.primary_expr, level + 1);
printf_buf(buf, "%p%c\n", level, "[primary end]");
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]");
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) {
printf_buf(buf, "%p%c\n", level, "[suffix list start]");
print_ast_node_list(buf, node->suffixed_expr.suffix_list, level + 1, NULL);
printf_buf(buf, "%p%c\n", level, "[suffix list end]");
printf_buf(buf, "%p%c\n", level+1, "[suffix list start]");
print_ast_node_list(buf, node->suffixed_expr.suffix_list, level + 2, NULL);
printf_buf(buf, "%p%c\n", level+1, "[suffix list end]");
}
printf_buf(buf, "%p%c\n", level, "[suffixed expr end]");
break;
}
case AST_FUNCTION_CALL_EXPR: {
@ -473,14 +475,14 @@ void raviA_print_ast_node(membuff_t *buf, struct ast_node *node, int level) {
break;
}
case AST_FIELD_SELECTOR_EXPR: {
printf_buf(buf, "%p%c\n", level, "[field selector start]");
printf_buf(buf, "%p%c %T\n", level, "[field selector start]", &node->index_expr.type);
printf_buf(buf, "%p.\n", level + 1);
raviA_print_ast_node(buf, node->index_expr.expr, level + 2);
printf_buf(buf, "%p%c\n", level, "[field selector end]");
break;
}
case AST_Y_INDEX_EXPR: {
printf_buf(buf, "%p%c\n", level, "[Y index start]");
printf_buf(buf, "%p%c %T\n", level, "[Y index start]", &node->index_expr.type);
printf_buf(buf, "%p[\n", level + 1);
raviA_print_ast_node(buf, node->index_expr.expr, level + 2);
printf_buf(buf, "%p]\n", level + 1);

4
src/ravi_ast_typecheck.c
Unescape View File

@ -142,6 +142,7 @@ static void typecheck_binaryop(struct ast_node *function, struct ast_node *node)
static void typecheck_suffixedexpr(struct ast_node *function, struct ast_node *node) {
typecheck_ast_node(function, node->suffixed_expr.primary_expr);
if (node->suffixed_expr.suffix_list) {
typecheck_ast_list(function, node->suffixed_expr.suffix_list);
}
}
@ -209,6 +210,7 @@ static void typecheck_ast_node(struct ast_node *function, struct ast_node *node)
break;
}
case AST_SYMBOL_EXPR: {
/* type should have been set when symbol was created */
break;
}
case AST_BINARY_EXPR: {
@ -224,9 +226,11 @@ static void typecheck_ast_node(struct ast_node *function, struct ast_node *node)
break;
}
case AST_FIELD_SELECTOR_EXPR: {
typecheck_ast_node(function, node->index_expr.expr);
break;
}
case AST_Y_INDEX_EXPR: {
typecheck_ast_node(function, node->index_expr.expr);
break;
}
case AST_INDEXED_ASSIGN_EXPR: {

Write Preview
Loading…
Cancel
Save