piumarta
/
subc
1
0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

add location information to error messages

master
Ian Piumarta 3 个月前
父节点
fda0129a1a
当前提交
4ddc05b90b
共有 2 个文件被更改，包括 177 次插入 和 145 次删除
分列视图
Diff 选项
显示统计 下载 Patch 文件 下载 Diff 文件
  1. +1
    -1
      Makefile
  2. +176
    -144
      main.leg

+ 1
- 1
Makefile 查看文件

@ -1,4 +1,4 @@
CFLAGS = -g
CFLAGS = -std=c99 -Werror -Wall -Wno-unused -g
CPPFLAGS = -I/opt/local/include
LDFLAGS = -L/opt/local/lib
LDLIBS = -lgc -lm

+ 176
- 144
main.leg 查看文件

@ -1,6 +1,6 @@
# main.leg -- C parser + interpreter
#
# Last edited: 2025-02-03 13:38:56 by piumarta on zora-1043.local
# Last edited: 2025-02-04 09:10:32 by piumarta on xubuntu
%{
;
@ -131,16 +131,16 @@ struct List { type_t _type; int size; oop *elements; };
struct Memory { type_t _type; void *base; size_t size; };
struct Reference { type_t _type; oop target; };
struct Closure { type_t _type; oop function, environment; };
struct Call { type_t _type; oop function, arguments; };
struct Call { type_t _type; oop function, arguments, token; };
struct Block { type_t _type; oop statements; };
struct Addressof { type_t _type; oop rhs; };
struct Dereference { type_t _type; oop rhs; };
struct Sizeof { type_t _type; oop rhs, size; };
struct Unary { type_t _type; unary_t operator; oop rhs; };
struct Binary { type_t _type; binary_t operator; oop lhs, rhs; };
struct Index { type_t _type; oop lhs, rhs; };
struct Member { type_t _type; oop lhs, name; };
struct Assign { type_t _type; oop token, lhs, rhs; };
struct Addressof { type_t _type; oop rhs, token; };
struct Dereference { type_t _type; oop rhs, token; };
struct Sizeof { type_t _type; oop rhs, size, token; };
struct Unary { type_t _type; unary_t operator; oop rhs, token; };
struct Binary { type_t _type; binary_t operator; oop lhs, rhs, token; };
struct Index { type_t _type; oop lhs, rhs, token; };
struct Member { type_t _type; oop lhs, name, token; };
struct Assign { type_t _type; oop lhs, rhs, token; };
struct Cast { type_t _type; oop type, rhs; cvt_t converter; };
struct While { type_t _type; oop condition, expression; };
struct For { type_t _type; oop initialiser, condition, update, body; };
@ -169,7 +169,7 @@ struct Constant { type_t _type; oop name, type, value; };
struct Function { type_t _type; oop name, type, parameters, body, *code; int variadic; };
struct Primitive { type_t _type; oop name, type, parameters; prim_t function; int variadic; };
struct VarDecls { type_t _type; oop type, variables; };
struct TypeDecls { type_t _type; oop type, typenames; };
struct TypeDecls { type_t _type; oop type, typenames, token; };
union Object
{
@ -583,6 +583,8 @@ int List_equal(oop list, oop brray)
return 1;
}
#if 0
struct keyval { oop key, val; };
oop newMap(void)
@ -629,6 +631,8 @@ oop Map_get(oop map, oop key)
return kvs[index].val;
}
#endif
oop newMemory(void *base, size_t size)
{
oop obj = new(Memory);
@ -639,39 +643,42 @@ oop newMemory(void *base, size_t size)
CTOR1(Reference, target);
CTOR2(Closure, function, environment);
CTOR2(Call, function, arguments);
CTOR3(Call, function, arguments, token);
CTOR1(Block, statements);
CTOR1(Addressof, rhs);
CTOR1(Dereference, rhs);
CTOR2(Addressof, rhs, token);
CTOR2(Dereference, rhs, token);
oop newSizeof(oop operand)
oop newSizeof(oop operand, oop token)
{
oop obj = new(Sizeof);
obj->Sizeof.rhs = operand;
obj->Sizeof.size = nil;
obj->Sizeof.token = token;
return obj;
}
oop newUnary(unary_t operator, oop operand)
oop newUnary(unary_t operator, oop operand, oop token)
{
oop obj = new(Unary);
obj->Unary.operator = operator;
obj->Unary.rhs = operand;
obj->Unary.token = token;
return obj;
}
oop newBinary(binary_t operator, oop lhs, oop rhs)
oop newBinary(binary_t operator, oop lhs, oop rhs, oop token)
{
oop obj = new(Binary);
obj->Binary.operator = operator;
obj->Binary.lhs = lhs;
obj->Binary.rhs = rhs;
obj->Binary.token = token;
return obj;
}
CTOR2(Index, lhs, rhs);
CTOR2(Member, lhs, name);
CTOR3(Assign, token, lhs, rhs);
CTOR3(Index, lhs, rhs, token);
CTOR3(Member, lhs, name, token);
CTOR3(Assign, lhs, rhs, token);
oop newCast(oop type, oop rhs)
{
@ -960,11 +967,12 @@ void TypeDecls_append(oop tds, oop decl)
List_append(get(tds, TypeDecls,typenames), decl);
}
oop newTypeDecls(oop type, oop decl)
oop newTypeDecls(oop type, oop decl, oop token)
{
oop obj = new(TypeDecls);
obj->TypeDecls.type = type;
obj->TypeDecls.typenames = newList();
obj->TypeDecls.token = token;
TypeDecls_append(obj, decl);
return obj;
}
@ -1072,6 +1080,10 @@ oop toStringOn(oop obj, oop str)
case Integer:
String_format(str, "%d", _integerValue(obj));
break;
case Float: {
String_format(str, "%f", _floatValue(obj));
break;
}
case Pointer: {
oop base = get(obj, Pointer,base);
switch (getType(base)) {
@ -1137,6 +1149,11 @@ oop toStringOn(oop obj, oop str)
toStringOn(get(obj, Dereference,rhs), str);
break;
}
case Addressof: {
String_append(str, '&');
toStringOn(get(obj, Addressof,rhs), str);
break;
}
case Sizeof: {
String_format(str, "sizeof(%d)", toString(get(obj, Sizeof,rhs)));
break;
@ -1769,8 +1786,8 @@ include = HASH INCLUDE (
tldecl = typedec | fundefn | primdef | vardecl
typedec = TYPEDEF
t:tname d:decltor { d = newTypeDecls(t, d) }
typedec = t:TYPEDEF
n:tname d:decltor { d = newTypeDecls(n, d, t) }
( COMMA e:decltor { TypeDecls_append(d, e) }
)* SEMI { $$ = d }
@ -1799,7 +1816,7 @@ members = LBRACE l:mkList ( v:vardecl { List_append(l, v) }
| e:error { expected(e, "struct/union member specification") }
) { $$ = l }
inidecl = d:decltor ( a:ASSIGN ( e:initor { $$ = newAssign(a, d, e) }
inidecl = d:decltor ( t:ASSIGN ( e:initor { $$ = newAssign(d, e, t) }
| e:error { expected(e, "variable initialiser") }
)
| { $$ = d }
@ -1827,10 +1844,14 @@ pdecl = t:tname d:decltor { $$ = newVariable(d, t, nil) }
initor = agrinit | expr
agrinit = LBRACE i:mkList
( j:initor { List_append(i, j) }
( COMMA j:initor { List_append(i, j) }
( j:initelt { List_append(i, j) }
( COMMA j:initelt { List_append(i, j) }
)* COMMA? )? RBRACE { $$ = i }
initelt = t:DOT i:id u:ASSIGN e:expr { $$ = newAssign(newMember(nil, i, t), e, u) }
| t:LBRAK i:expr RBRAK u:ASSIGN e:expr { $$ = newAssign(newIndex (nil, i, t), e, u) }
| initor
fundefn = t:tname d:funid
p:params b:block { $$ = newFunction(d, t, p, b) }
@ -1870,57 +1891,57 @@ expropt = expr | { $$ = nil }
expr = assign
assign = l:unary a:ASSIGN x:expr { $$ = newAssign(a, l, x) }
assign = l:unary t:ASSIGN x:expr { $$ = newAssign(l, x, t) }
| logor
logor = l:logand ( BARBAR r:logand { l = newBinary(LOR, l, r) }
logor = l:logand ( t:BARBAR r:logand { l = newBinary(LOR, l, r, t) }
)* { $$ = l }
logand = l:bitor ( ANDAND r:bitor { l = newBinary(LAND, l, r) }
logand = l:bitor ( t:ANDAND r:bitor { l = newBinary(LAND, l, r, t) }
)* { $$ = l }
bitor = l:bitxor ( BAR r:bitxor { l = newBinary(BOR, l, r) }
bitor = l:bitxor ( t:BAR r:bitxor { l = newBinary(BOR, l, r, t) }
)* { $$ = l }
bitxor = l:bitand ( HAT r:bitand { l = newBinary(BXOR, l, r) }
bitxor = l:bitand ( t:HAT r:bitand { l = newBinary(BXOR, l, r, t) }
)* { $$ = l }
bitand = l:equal ( AND r:equal { l = newBinary(BAND, l, r) }
bitand = l:equal ( t:AND r:equal { l = newBinary(BAND, l, r, t) }
)* { $$ = l }
equal = l:inequal ( EQUAL r:inequal { l = newBinary(EQ, l, r) }
| NEQUAL r:inequal { l = newBinary(NE, l, r) }
)* { $$ = l }
equal = l:inequal ( t:EQUAL r:inequal { l = newBinary(EQ, l, r, t) }
| t:NEQUAL r:inequal { l = newBinary(NE, l, r, t) }
)* { $$ = l }
inequal = l:shift ( LESS r:shift { l = newBinary(LT, l, r) }
| LESSEQ r:shift { l = newBinary(LE, l, r) }
| GRTREQ r:shift { l = newBinary(GE, l, r) }
| GRTR r:shift { l = newBinary(GT, l, r) }
inequal = l:shift ( t:LESS r:shift { l = newBinary(LT, l, r, t) }
| t:LESSEQ r:shift { l = newBinary(LE, l, r, t) }
| t:GRTREQ r:shift { l = newBinary(GE, l, r, t) }
| t:GRTR r:shift { l = newBinary(GT, l, r, t) }
)* { $$ = l }
shift = l:sum ( LSHIFT r:sum { l = newBinary(SHL, l, r) }
| RSHIFT r:sum { l = newBinary(SHR, l, r) }
shift = l:sum ( t:LSHIFT r:sum { l = newBinary(SHL, l, r, t) }
| t:RSHIFT r:sum { l = newBinary(SHR, l, r, t) }
)* { $$ = l }
sum = l:prod ( PLUS r:prod { l = newBinary(ADD, l, r) }
| MINUS r:prod { l = newBinary(SUB, l, r) }
sum = l:prod ( t:PLUS r:prod { l = newBinary(ADD, l, r, t) }
| t:MINUS r:prod { l = newBinary(SUB, l, r, t) }
)* { $$ = l }
prod = l:unary ( STAR r:unary { l = newBinary(MUL, l, r) }
| SLASH r:unary { l = newBinary(DIV, l, r) }
| PCENT r:unary { l = newBinary(MOD, l, r) }
prod = l:unary ( t:STAR r:unary { l = newBinary(MUL, l, r, t) }
| t:SLASH r:unary { l = newBinary(DIV, l, r, t) }
| t:PCENT r:unary { l = newBinary(MOD, l, r, t) }
)* { $$ = l }
unary = MINUS r:unary { $$ = newUnary(NEG, r) }
| PLING r:unary { $$ = newUnary(NOT, r) }
| TILDE r:unary { $$ = newUnary(COM, r) }
| STAR r:unary { $$ = newDereference(r) }
| AND r:unary { $$ = newAddressof(r) }
| PPLUS r:unary { $$ = newUnary(PREINC, r) }
| MMINUS r:unary { $$ = newUnary(PREDEC, r) }
| SIZEOF
( r:unary { $$ = newSizeof(r) }
| LPAREN t:tnamdec RPAREN { $$ = newSizeof(t) }
unary = t:MINUS r:unary { $$ = newUnary(NEG, r, t) }
| t:PLING r:unary { $$ = newUnary(NOT, r, t) }
| t:TILDE r:unary { $$ = newUnary(COM, r, t) }
| t:STAR r:unary { $$ = newDereference( r, t) }
| t:AND r:unary { $$ = newAddressof( r, t) }
| t:PPLUS r:unary { $$ = newUnary(PREINC, r, t) }
| t:MMINUS r:unary { $$ = newUnary(PREDEC, r, t) }
| t:SIZEOF
( r:unary { $$ = newSizeof(r, t) }
| LPAREN r:tnamdec RPAREN { $$ = newSizeof(r, t) }
)
| cast
| postfix
@ -1930,20 +1951,20 @@ cast = LPAREN t:tnamdec
tnamdec = t:tname d:decltor { $$ = makeType(t, d) }
postfix = v:value ( a:args { v = newCall(v, a) }
| i:index { v = newIndex(v, i) }
| PPLUS { v = newUnary(POSTINC, v) }
| MMINUS { v = newUnary(POSTDEC, v) }
| DOT i:id { v = newMember(v, i) }
| ARROW i:id { v = newMember(newDereference(v), i) }
)* { $$ = v }
postfix = v:value ( t:LPAREN a:args RPAREN { v = newCall(v, a, t) }
| t:LBRAK i:expr RBRAK { v = newIndex(v, i, t) }
| t:PPLUS { v = newUnary(POSTINC, v, t) }
| t:MMINUS { v = newUnary(POSTDEC, v, t) }
| t:DOT i:id { v = newMember(v, i, t) }
| t:ARROW i:id { v = newMember(newDereference(v, t), i, t) }
)* { $$ = v }
args = LPAREN a:mkList
( e:expr { List_append(a, e) }
( COMMA e:expr { List_append(a, e) }
)* )? RPAREN { $$ = a }
args = a:mkList
( e:expr { List_append(a, e) }
( COMMA e:expr { List_append(a, e) }
)* )? { $$ = a }
index = LBRAK e:expr RBRAK { $$ = e }
# index = LBRAK e:expr RBRAK { $$ = e }
value = LPAREN e:expr RPAREN { $$ = e }
| float
@ -2006,65 +2027,65 @@ eol = ( '\n' '\r'? | '\r' '\n'? ) { lineNo += 1 }
comment = "//" (!eol .)* eol
| "/*" (!"*/" (eol | .))* "*/"
INCLUDE = "include" ![_a-zA-Z0-9] -
EXTERN = "extern" ![_a-zA-Z0-9] -
STATIC = "static" ![_a-zA-Z0-9] -
TYPEDEF = "typedef" ![_a-zA-Z0-9] -
VOID = "void" ![_a-zA-Z0-9] -
CHAR = "char" ![_a-zA-Z0-9] -
SHORT = "short" ![_a-zA-Z0-9] -
INT = "int" ![_a-zA-Z0-9] -
LONG = "long" ![_a-zA-Z0-9] -
FLOAT = "float" ![_a-zA-Z0-9] -
DOUBLE = "double" ![_a-zA-Z0-9] -
STRUCT = "struct" ![_a-zA-Z0-9] -
UNION = "union" ![_a-zA-Z0-9] -
ENUM = "enum" ![_a-zA-Z0-9] -
# UNION = "union" ![_a-zA-Z0-9] -
# ENUM = "enum" ![_a-zA-Z0-9] -
SIZEOF = "sizeof" ![_a-zA-Z0-9] -
IF = "if" ![_a-zA-Z0-9] -
ELSE = "else" ![_a-zA-Z0-9] -
WHILE = "while" ![_a-zA-Z0-9] -
FOR = "for" ![_a-zA-Z0-9] -
RETURN = "return" ![_a-zA-Z0-9] -
CONTINU = "continue" ![_a-zA-Z0-9] -
BREAK = "break" ![_a-zA-Z0-9] -
DOT = "." !"." -
ARROW = "->" -
ETC = "..." -
HASH = "#" -
ASSIGN = < "=" !"=" > { $$ = newToken(yytext) } -
PLUS = "+" !"+" -
PPLUS = &#34;++" -
MINUS = "-" !"-" -
MMINUS = &#34;--" -
STAR = "*" -
BAR = "|" !"|" -
BARBAR = &#34;||" -
AND = "&" !"&" -
ANDAND = &#34;&&" -
HAT = "^" -
EQUAL = &#34;==" -
NEQUAL = "!=" -
LESS = "<" ![=<] -
LESSEQ = &#34;<=" -
GRTREQ = &#34;>=" -
GRTR = ">" ![=>] -
LSHIFT = &#34;<<" -
RSHIFT = &#34;>>" -
SLASH = "/" -
PCENT = "%" -
PLING = "!" !"=" -
TILDE = "~" -
LPAREN = "(" -
RPAREN = ")" -
LBRAK = "[" -
RBRAK = "]" -
LBRACE = "{" -
RBRACE = "}" -
COMMA = "," -
SEMI = ";" -
INCLUDE = &lt; &#34;include" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
EXTERN = &lt; &#34;extern" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
STATIC = &lt; &#34;static" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
TYPEDEF = &lt; &#34;typedef" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
VOID = &lt; &#34;void" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
CHAR = &lt; &#34;char" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
SHORT = &lt; &#34;short" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
INT = &lt; &#34;int" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
LONG = &lt; &#34;long" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
FLOAT = &lt; &#34;float" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
DOUBLE = &lt; &#34;double" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
STRUCT = &lt; &#34;struct" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
UNION = &lt; &#34;union" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
ENUM = &lt; &#34;enum" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
# UNION = &lt; &#34;union" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
# ENUM = &lt; &#34;enum" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
SIZEOF = &lt; &#34;sizeof" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
IF = &lt; &#34;if" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
ELSE = &lt; &#34;else" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
WHILE = &lt; &#34;while" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
FOR = &lt; &#34;for" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
RETURN = &lt; &#34;return" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
CONTINU = &lt; &#34;continue" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
BREAK = &lt; &#34;break" ![_a-zA-Z0-9] > { $$ = newToken(yytext) } -
DOT = &lt; &#34;." !"." > { $$ = newToken(yytext) } -
ARROW = &lt; &#34;->" > { $$ = newToken(yytext) } -
ETC = &lt; &#34;..." > { $$ = newToken(yytext) } -
HASH = &lt; &#34;#" > { $$ = newToken(yytext) } -
ASSIGN = < "=" !"=" > { $$ = newToken(yytext) } -
PLUS = &lt; &#34;+" !"+" > { $$ = newToken(yytext) } -
PPLUS = &lt; "++" > { $$ = newToken(yytext) } -
MINUS = &lt; &#34;-" !"-" > { $$ = newToken(yytext) } -
MMINUS = &lt; "--" > { $$ = newToken(yytext) } -
STAR = &lt; &#34;*" > { $$ = newToken(yytext) } -
BAR = &lt; &#34;|" !"|" > { $$ = newToken(yytext) } -
BARBAR = &lt; "||" > { $$ = newToken(yytext) } -
AND = &lt; &#34;&" !"&" > { $$ = newToken(yytext) } -
ANDAND = &lt; "&&" > { $$ = newToken(yytext) } -
HAT = &lt; &#34;^" > { $$ = newToken(yytext) } -
EQUAL = &lt; "==" > { $$ = newToken(yytext) } -
NEQUAL = "!=" > { $$ = newToken(yytext) } -
LESS = &lt; &#34;<" ![=<] > { $$ = newToken(yytext) } -
LESSEQ = &lt; "<=" > { $$ = newToken(yytext) } -
GRTREQ = &lt; ">=" > { $$ = newToken(yytext) } -
GRTR = &lt; &#34;>" ![=>] > { $$ = newToken(yytext) } -
LSHIFT = &lt; "<<" > { $$ = newToken(yytext) } -
RSHIFT = &lt; ">>" > { $$ = newToken(yytext) } -
SLASH = &lt; &#34;/" > { $$ = newToken(yytext) } -
PCENT = &lt; &#34;%" > { $$ = newToken(yytext) } -
PLING = &lt; &#34;!" !"=" > { $$ = newToken(yytext) } -
TILDE = &lt; &#34;~" > { $$ = newToken(yytext) } -
LPAREN = &lt; &#34;(" > { $$ = newToken(yytext) } -
RPAREN = &lt; &#34;)" > { $$ = newToken(yytext) } -
LBRAK = &lt; &#34;[" > { $$ = newToken(yytext) } -
RBRAK = &lt; &#34;]" > { $$ = newToken(yytext) } -
LBRACE = &lt; &#34;{" > { $$ = newToken(yytext) } -
RBRACE = &lt; &#34;}" > { $$ = newToken(yytext) } -
COMMA = &lt; &#34;," > { $$ = newToken(yytext) } -
SEMI = &lt; &#34;;" > { $$ = newToken(yytext) } -
%%
;
@ -2231,7 +2252,7 @@ cvt_t converter(int tfrom, int tto)
{ 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // short
{ 0, 0, 0, cvtI, cvtI, 0, 0, 0, 0 }, // int
{ 0, 0, 0, cvtI, 0, 0, 0, cvt_, 0 }, // long
{ 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // float
{ 0, 0, 0, 0, 0, cvt_, 0, 0, 0 }, // float
{ 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // double
{ 0, 0, 0, 0, cvt_, 0, 0, cvt_, 0 }, // pointer
{ 0, 0, 0, 0, 0, 0, 0, 0, 0 }, // array
@ -2588,7 +2609,9 @@ oop typeCheck(oop exp, oop fntype)
case Dereference: {
oop rhs = get(exp, Dereference,rhs);
oop rht = typeCheck(rhs, fntype);
if (!is(Tpointer, rht)) fatal("cannot dereference '%s'", toString(rhs));
if (!is(Tpointer, rht))
fatal("%scannot dereference '%s'",
tokloc(get(exp, Dereference,token)), toString(rhs));
return get(rht, Tpointer,target);
}
case Cast: {
@ -2672,7 +2695,8 @@ oop typeCheck(oop exp, oop fntype)
if (is(Tarray, lhs) && t_int == rhs) {
return newTpointer(get(lhs, Tarray,target));
}
fatal("cannot add '%s' and '%s'", toString(lhs), toString(rhs));
fatal("%scannot add '%s' and '%s'", tokloc(get(exp, Binary,token)),
toString(lhs), toString(rhs));
break;
}
case SUB: assert(!"unimplemented"); break;
@ -2695,7 +2719,9 @@ oop typeCheck(oop exp, oop fntype)
case Index: {
oop lhs = typeCheck(get(exp, Index,lhs), fntype);
oop rhs = typeCheck(get(exp, Index,rhs), fntype);
if (t_int != rhs) fatal("array index is not 'int': %s", toString(get(exp, Binary,rhs)));
if (t_int != rhs)
fatal("%sarray index is not 'int': %s",
tokloc(get(exp, Index,token)), toString(get(exp, Index,rhs)));
switch (getType(lhs)) {
case Tpointer: assert(!"unimplemented");
case Tarray: return get(lhs, Tarray,target);
@ -2739,7 +2765,7 @@ oop typeCheck(oop exp, oop fntype)
goto error;
}
error:
fatal("incompatible types assigning '%s' to '%s'", toString(rhs), toString(lhs));
fatal("%sincompatible types assigning '%s' to '%s'", tokloc(get(exp, Assign,token)), toString(rhs), toString(lhs));
return lhs;
}
case If: {
@ -2862,7 +2888,8 @@ oop typeCheck(oop exp, oop fntype)
oop function = get(exp, Call,function );
oop arguments = get(exp, Call,arguments);
oop tfunc = typeCheck(function, fntype);
if (!is(Tfunction, tfunc)) fatal("cannot call %s", getTypeName(tfunc));
if (!is(Tfunction, tfunc))
fatal("%scannot call %s", tokloc(get(exp, Call,token)), toString(tfunc));
oop params = get(tfunc, Tfunction,parameters);
int argc = get(arguments, List,size);
oop *argv = get(arguments, List,elements);
@ -2870,7 +2897,8 @@ oop typeCheck(oop exp, oop fntype)
oop *parv = get(params, List,elements);
int vararg = parc && (t_etc == parv[parc - 1]);
if ((!vararg && (argc != parc)) || (vararg && (argc < parc - 1)))
fatal("wrong number (%d) of arguments, expected %d", argc, parc);
fatal("%swrong number (%d) of arguments, expected %d",
tokloc(get(exp, Call,token)), argc, parc);
int argn = 0;
while (argn < argc) {
oop part = parv[argn];
@ -3299,16 +3327,17 @@ oop assign(oop lhs, oop rhs)
return setMemory(memory, offset, vtype, eval(rhs));
}
case Dereference: { // *<&var> = rhs, *<&const> = rhs, *<&memory> = rhs
lhs = eval(get(lhs, Dereference,rhs));
switch (getType(lhs)) {
oop ptr = eval(get(lhs, Dereference,rhs));
switch (getType(ptr)) {
case Pointer: { // &x
oop base = get(lhs, Pointer,base);
int offset = get(lhs, Pointer,offset);
oop type = get(get(lhs, Pointer,type), Tpointer,target);
oop base = get(ptr, Pointer,base);
int offset = get(ptr, Pointer,offset);
oop type = get(get(ptr, Pointer,type), Tpointer,target);
int scale = typeSize(type);
switch (getType(base)) {
case Integer: { // (void *)(intptr_t)N
fatal("attempt to store into arbitrary memory location");
fatal("%sattempt to store into arbitrary memory location",
tokloc(get(lhs, Dereference,token)));
}
case Variable: { // &var
if (offset) fatal("pointer modified");
@ -3615,7 +3644,8 @@ oop eval(oop exp)
}
case Index: {
oop ondex = eval(get(rhs, Index,rhs));
if (!is(Integer, ondex)) fatal("array index is not 'int'");
if (!is(Integer, ondex))
fatal("%sarray index is not 'int'", tokloc(get(rhs, Index,token)));
int index = _integerValue(ondex);
oop lhs = eval(get(rhs, Index,lhs));
switch (getType(lhs)) {
@ -3631,7 +3661,7 @@ oop eval(oop exp)
default:
break;
}
fatal("cannot take address of: %s", toString(rhs));
fatal("%scannot take address: %s", tokloc(get(exp, Addressof,token)), toString(exp));
break;
}
case Dereference: {
@ -3676,7 +3706,8 @@ oop eval(oop exp)
default: break;
}
}
fatal("illegal increment operation: %s", toString(exp));
fatal("%sillegal increment operation: %s",
tokloc(get(exp, Unary,token)), toString(exp));
}
case NEG:
case NOT:
@ -3985,7 +4016,8 @@ oop preval(oop exp)
default: break;
}
}
fatal("illegal increment operation: %s", toString(exp));
fatal("%sillegal increment operation: %s",
tokloc(get(exp, Unary,token)), toString(exp));
}
case NEG:
case NOT:

撰写 预览
正在加载...
取消
保存