projects
/
m6w6
/
ext-psi
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
flush
[m6w6/ext-psi]
/
src
/
parser.re
diff --git
a/src/parser.re
b/src/parser.re
index 3cfe130f8a0b8b9a4795dbb5f4389e01110c31d4..48e90ed9f6ba648fb33ef145a8afa27b74ac5806 100644
(file)
--- a/
src/parser.re
+++ b/
src/parser.re
@@
-55,7
+55,7
@@
struct psi_parser *psi_parser_init(struct psi_parser *P, const char *filename, p
return P;
}
return P;
}
-size_t psi_parser_fill(struct psi_parser *P, size_t n)
+s
s
ize_t psi_parser_fill(struct psi_parser *P, size_t n)
{
if (P->flags & PSI_PARSER_DEBUG) {
fprintf(stderr, "PSI> Fill: n=%zu\n", n);
{
if (P->flags & PSI_PARSER_DEBUG) {
fprintf(stderr, "PSI> Fill: n=%zu\n", n);
@@
-91,7
+91,7
@@
size_t psi_parser_fill(struct psi_parser *P, size_t n)
}
}
if (P->flags & PSI_PARSER_DEBUG) {
}
}
if (P->flags & PSI_PARSER_DEBUG) {
- fprintf(stderr, "PSI> Fill: avail=%
zu
\n", P->lim - P->cur);
+ fprintf(stderr, "PSI> Fill: avail=%
td
\n", P->lim - P->cur);
}
return P->lim - P->cur;
}
}
return P->lim - P->cur;
}
@@
-171,7
+171,7
@@
token_t psi_parser_scan(struct psi_parser *P)
W = [a-zA-Z0-9_];
NAME = [a-zA-Z_]W*;
NSNAME = (NAME)? ("\\" NAME)+;
W = [a-zA-Z0-9_];
NAME = [a-zA-Z_]W*;
NSNAME = (NAME)? ("\\" NAME)+;
- DOLLAR_NAME = '$'
NAME
;
+ DOLLAR_NAME = '$'
W+
;
QUOTED_STRING = "\"" ([^\"])+ "\"";
NUMBER = [+-]? [0-9]* "."? [0-9]+ ([eE] [+-]? [0-9]+)?;
QUOTED_STRING = "\"" ([^\"])+ "\"";
NUMBER = [+-]? [0-9]* "."? [0-9]+ ([eE] [+-]? [0-9]+)?;
@@
-243,6
+243,7
@@
token_t psi_parser_scan(struct psi_parser *P)
'ARRVAL' {RETURN(PSI_T_ARRVAL);}
'OBJVAL' {RETURN(PSI_T_OBJVAL);}
'ZVAL' {RETURN(PSI_T_ZVAL);}
'ARRVAL' {RETURN(PSI_T_ARRVAL);}
'OBJVAL' {RETURN(PSI_T_OBJVAL);}
'ZVAL' {RETURN(PSI_T_ZVAL);}
+ 'COUNT' {RETURN(PSI_T_COUNT);}
'CALLOC' {RETURN(PSI_T_CALLOC);}
'TO_OBJECT' {RETURN(PSI_T_TO_OBJECT);}
'TO_ARRAY' {RETURN(PSI_T_TO_ARRAY);}
'CALLOC' {RETURN(PSI_T_CALLOC);}
'TO_OBJECT' {RETURN(PSI_T_TO_OBJECT);}
'TO_ARRAY' {RETURN(PSI_T_TO_ARRAY);}