void PSI_ParserProc(void *, token_t, PSI_Token *, PSI_Parser *);
void PSI_ParserProcTrace(FILE *, const char*);
-PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, unsigned flags)
+PSI_Parser *PSI_ParserInit(PSI_Parser *P, const char *filename, psi_error_cb error, unsigned flags)
{
FILE *fp;
}
memset(P, 0, sizeof(*P));
+ P->psi.file.fn = strdup(filename);
P->fp = fp;
- P->fn = strdup(filename);
P->line = 1;
+ P->error = error;
P->flags = flags;
P->proc = PSI_ParserProcAlloc(malloc);
}
void PSI_ParserSyntaxError(PSI_Parser *P, const char *fn, size_t ln, const char *msg, ...) {
- fprintf(stderr, "WARNING: Syntax error on line %zu in '%s'%s", ln, fn, msg ? ": ": "\n");
- if (msg) {
- va_list argv;
+ char buf[0x1000] = {0};
+ va_list argv;
+
+ va_start(argv, msg);
+ vsnprintf(buf, 0x1000-1, msg, argv);
+ va_end(argv);
+
+ P->error(PSI_WARNING, "PSI syntax error on line %zu in '%s'%s%s",
+ ln, fn, msg ? ": ": "", buf);
- va_start(argv, msg);
- vfprintf(stderr, msg, argv);
- va_end(argv);
- }
++P->errors;
}
return t; \
} while(1)
-/* DIGIT = [0-9]
- DIGITS = DIGIT+
- DECIMALS = (+|-)? DIGIT* "."
- digits ::= digits DIGIT.
- decimals ::= digits DOT digits.
- decimals ::= DOT digits.
- decimals ::= digits DOT.
- number ::= digits.
- number ::= PLUS digits.
- number ::= MINUS digits.
- number ::= decimals.
- number ::= MINUS decimals.
- number ::= PLUS decimals.
-
-*/
token_t PSI_ParserScan(PSI_Parser *P)
{
for (;;) {
NAME = [a-zA-Z_]W*;
NSNAME = (NAME)? ("\\" NAME)+;
QUOTED_STRING = "\"" ([^\"])+ "\"";
- TRUE = 'TRUE';
- FALSE = 'FALSE';
- NULL = 'NULL';
- MIXED = 'mixed';
- VOID = 'void';
- BOOL = 'bool';
- INT = 'int';
- FLOAT = 'float';
- DOUBLE = 'double';
- SINT8 = 'sint8';
- UINT8 = 'uint8';
- SINT16 = 'sint16';
- UINT16 = 'uint16';
- SINT32 = 'sint32';
- UINT32 = 'uint32';
- SINT64 = 'sint64';
- UINT64 = 'uint64';
- STRING = 'string';
- ARRAY = 'array';
- FUNCTION = 'function';
- TYPEDEF = 'typedef';
- LIB = 'lib';
- LET = 'let';
- SET = 'set';
- RET = 'ret';
- STRLEN = 'strlen';
- STRVAL = 'strval';
- INTVAL = 'intval';
- FLOATVAL = 'floatval';
- BOOLVAL = 'boolval';
- TO_STRING = 'to_string';
- TO_INT = 'to_int';
- TO_FLOAT = 'to_float';
- TO_BOOL = 'to_bool';
NUMBER = [+-]? [0-9]* "."? [0-9]+ ([eE] [+-]? [0-9]+)?;
- "#" .* "\n" { ++P->line; RETURN(PSI_T_COMMENT);}
+ ("#"|"//") .* "\n" { ++P->line; continue;}
"(" {RETURN(PSI_T_LPAREN);}
")" {RETURN(PSI_T_RPAREN);}
";" {RETURN(PSI_T_EOS);}
":" {RETURN(PSI_T_COLON);}
"{" {RETURN(PSI_T_LBRACE);}
"}" {RETURN(PSI_T_RBRACE);}
+ "[" {RETURN(PSI_T_LBRACKET);}
+ "]" {RETURN(PSI_T_RBRACKET);}
"=" {RETURN(PSI_T_EQUALS);}
"$" {RETURN(PSI_T_DOLLAR);}
"*" {RETURN(PSI_T_POINTER);}
"&" {RETURN(PSI_T_REFERENCE);}
[\r\n] { ++P->line; continue; }
[\t ]+ { continue; }
- TRUE {RETURN(PSI_T_TRUE);}
- FALSE {RETURN(PSI_T_FALSE);}
- NULL {RETURN(PSI_T_NULL);}
- MIXED {RETURN(PSI_T_MIXED);}
- VOID {RETURN(PSI_T_VOID);}
- BOOL {RETURN(PSI_T_BOOL);}
- INT {RETURN(PSI_T_INT);}
- FLOAT {RETURN(PSI_T_FLOAT);}
- DOUBLE {RETURN(PSI_T_DOUBLE);}
- SINT8 {RETURN(PSI_T_SINT8);}
- UINT8 {RETURN(PSI_T_UINT8);}
- SINT16 {RETURN(PSI_T_SINT16);}
- UINT16 {RETURN(PSI_T_UINT16);}
- SINT32 {RETURN(PSI_T_SINT32);}
- UINT32 {RETURN(PSI_T_UINT32);}
- SINT64 {RETURN(PSI_T_SINT64);}
- UINT64 {RETURN(PSI_T_UINT64);}
- STRING {RETURN(PSI_T_STRING);}
- ARRAY {RETURN(PSI_T_ARRAY);}
- FUNCTION {RETURN(PSI_T_FUNCTION);}
- TYPEDEF {RETURN(PSI_T_TYPEDEF);}
- LIB {RETURN(PSI_T_LIB);}
- LET {RETURN(PSI_T_LET);}
- SET {RETURN(PSI_T_SET);}
- RET {RETURN(PSI_T_RET);}
- STRLEN {RETURN(PSI_T_STRLEN);}
- STRVAL {RETURN(PSI_T_STRVAL);}
- INTVAL {RETURN(PSI_T_INTVAL);}
- FLOATVAL {RETURN(PSI_T_FLOATVAL);}
- BOOLVAL {RETURN(PSI_T_BOOLVAL);}
- TO_STRING {RETURN(PSI_T_TO_STRING);}
- TO_INT {RETURN(PSI_T_TO_INT);}
- TO_FLOAT {RETURN(PSI_T_TO_FLOAT);}
- TO_BOOL {RETURN(PSI_T_TO_BOOL);}
+ 'TRUE' {RETURN(PSI_T_TRUE);}
+ 'FALSE' {RETURN(PSI_T_FALSE);}
+ 'NULL' {RETURN(PSI_T_NULL);}
+ 'MIXED' {RETURN(PSI_T_MIXED);}
+ 'VOID' {RETURN(PSI_T_VOID);}
+ 'BOOL' {RETURN(PSI_T_BOOL);}
+ 'INT' {RETURN(PSI_T_INT);}
+ 'FLOAT' {RETURN(PSI_T_FLOAT);}
+ 'DOUBLE' {RETURN(PSI_T_DOUBLE);}
+ 'INT8_T' {RETURN(PSI_T_INT8);}
+ 'UINT8_T' {RETURN(PSI_T_UINT8);}
+ 'INT16_T' {RETURN(PSI_T_INT16);}
+ 'UINT16_T' {RETURN(PSI_T_UINT16);}
+ 'INT32_T' {RETURN(PSI_T_INT32);}
+ 'UINT32_T' {RETURN(PSI_T_UINT32);}
+ 'INT64_T' {RETURN(PSI_T_INT64);}
+ 'UINT64_T' {RETURN(PSI_T_UINT64);}
+ 'UNSIGNED' {RETURN(PSI_T_UNSIGNED);}
+ 'STRING' {RETURN(PSI_T_STRING);}
+ 'ARRAY' {RETURN(PSI_T_ARRAY);}
+ 'FUNCTION' {RETURN(PSI_T_FUNCTION);}
+ 'TYPEDEF' {RETURN(PSI_T_TYPEDEF);}
+ 'STRUCT' {RETURN(PSI_T_STRUCT);}
+ 'CONST' {RETURN(PSI_T_CONST);}
+ 'LIB' {RETURN(PSI_T_LIB);}
+ 'LET' {RETURN(PSI_T_LET);}
+ 'SET' {RETURN(PSI_T_SET);}
+ 'RETURN' {RETURN(PSI_T_RETURN);}
+ 'FREE' {RETURN(PSI_T_FREE);}
+ 'STRLEN' {RETURN(PSI_T_STRLEN);}
+ 'STRVAL' {RETURN(PSI_T_STRVAL);}
+ 'INTVAL' {RETURN(PSI_T_INTVAL);}
+ 'FLOATVAL' {RETURN(PSI_T_FLOATVAL);}
+ 'BOOLVAL' {RETURN(PSI_T_BOOLVAL);}
+ 'ARRVAL' {RETURN(PSI_T_ARRVAL);}
+ 'CALLOC' {RETURN(PSI_T_CALLOC);}
+ 'TO_ARRAY' {RETURN(PSI_T_TO_ARRAY);}
+ 'TO_STRING' {RETURN(PSI_T_TO_STRING);}
+ 'TO_INT' {RETURN(PSI_T_TO_INT);}
+ 'TO_FLOAT' {RETURN(PSI_T_TO_FLOAT);}
+ 'TO_BOOL' {RETURN(PSI_T_TO_BOOL);}
NUMBER {RETURN(PSI_T_NUMBER);}
NAME {RETURN(PSI_T_NAME);}
NSNAME {RETURN(PSI_T_NSNAME);}
QUOTED_STRING {RETURN(PSI_T_QUOTED_STRING);}
- [^] {break;}
+ [^] {break;}
*/
}
return -1;
projects / m6w6 / ext-psi / blobdiff