summaryrefslogtreecommitdiff
path: root/src/lib/syntax.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/syntax.c')
-rw-r--r--src/lib/syntax.c86
1 files changed, 38 insertions, 48 deletions
diff --git a/src/lib/syntax.c b/src/lib/syntax.c
index 3354050..5b60fac 100644
--- a/src/lib/syntax.c
+++ b/src/lib/syntax.c
@@ -56,8 +56,10 @@ peek(struct scan_state *state)
static uint32_t
advance(struct scan_state *state)
{
- state->offset += char_length(*state->text, state->offset);
- state->skip_number_and_identifier = 0;
+ if(peek(state) != INVALID_CHAR){
+ state->offset += char_length(*state->text, state->offset);
+ state->skip_number_and_identifier = 0;
+ }
return peek(state);
}
@@ -81,7 +83,7 @@ skip_space(struct scan_state *state)
#define T tokens->tokens[token_index]
static enum aplwc_rc
-single_sym(struct scan_state *state, struct token_list *tokens, size_t token_index, int check_only)
+single_sym(struct scan_state *state, struct token_list *tokens, size_t token_index)
{
uint32_t c;
size_t start;
@@ -110,11 +112,9 @@ single_sym(struct scan_state *state, struct token_list *tokens, size_t token_ind
goto end;
}
T.tag = TOKEN_TAG_UNKNOWN_SYM;
- if(!check_only){
- if((rc = newsym(state, start, 1, &sym)) != APLWC_OK)
- goto end;
- T.data.symbol = sym;
- }
+ if((rc = newsym(state, start, 1, &sym)) != APLWC_OK)
+ goto end;
+ T.data.symbol = sym;
break;
}
@@ -125,7 +125,7 @@ end:
}
static enum aplwc_rc
-identifier(struct scan_state *state, struct token_list *tokens, size_t token_index, int check_only)
+identifier(struct scan_state *state, struct token_list *tokens, size_t token_index)
{
uint32_t c;
size_t start, len;
@@ -148,11 +148,9 @@ identifier(struct scan_state *state, struct token_list *tokens, size_t token_ind
}while(is_id_continue(c));
T.tag = TOKEN_TAG_IDENTIFIER;
- if(!check_only){
- if((rc = newsym(state, start, len, &sym)) != APLWC_OK)
- goto end;
- T.data.symbol = sym;
- }
+ if((rc = newsym(state, start, len, &sym)) != APLWC_OK)
+ goto end;
+ T.data.symbol = sym;
state->skip_number_and_identifier = 1;
rc = APLWC_OK;
@@ -162,7 +160,7 @@ end:
}
static enum aplwc_rc
-keyword(struct scan_state *state, struct token_list *tokens, size_t token_index, int check_only)
+keyword(struct scan_state *state, struct token_list *tokens, size_t token_index)
{
uint32_t c;
size_t start, len;
@@ -180,35 +178,30 @@ keyword(struct scan_state *state, struct token_list *tokens, size_t token_index,
c = advance(state);
start = state->offset;
- len = 0;
- do{
- c = advance(state);
+ for(len = 0; is_id_continue(c); c = advance(state))
len++;
- }while(is_id_continue(c));
rc = APLWC_OK;
T.tag = TOKEN_TAG_KEYWORD;
- if(!check_only){
- if((rc = newsym(state, start, len, &sym)) != APLWC_OK)
- goto end;
+ if((rc = newsym(state, start, len, &sym)) != APLWC_OK)
+ goto end;
- for(kw = 0; kw < N_KWDS; kw++){
- if(sym == state->aplwc->keyword_symbols[kw]){
- T.data.keyword = kw;
- break;
- }
+ for(kw = 0; kw < N_KWDS; kw++){
+ if(sym == state->aplwc->keyword_symbols[kw]){
+ T.data.keyword = kw;
+ break;
}
- if(kw == N_KWDS)
- rc = APLWC_INVALID_SYNTAX;
-
}
+ if(kw == N_KWDS)
+ rc = APLWC_INVALID_SYNTAX;
+
end:
MEMPTRS_EXIT(state->aplwc);
return rc;
}
static enum aplwc_rc
-number(struct scan_state *state, struct token_list *tokens, size_t token_index, int check_only)
+number(struct scan_state *state, struct token_list *tokens, size_t token_index)
{
uint32_t c;
int has_digits;
@@ -217,8 +210,6 @@ number(struct scan_state *state, struct token_list *tokens, size_t token_index,
MEMPTRS(state->aplwc, 1);
MEMPTR(0, tokens);
- UNUSED_PARAMETER(check_only);
-
rc = APLWC_INVALID_SYNTAX;
c = peek(state);
@@ -260,7 +251,7 @@ end:
}
static enum aplwc_rc
-text(struct scan_state *state, struct token_list *tokens, size_t token_index, int check_only)
+text(struct scan_state *state, struct token_list *tokens, size_t token_index)
{
uint32_t c;
enum aplwc_rc rc;
@@ -268,8 +259,6 @@ text(struct scan_state *state, struct token_list *tokens, size_t token_index, in
MEMPTRS(state->aplwc, 1);
MEMPTR(0, tokens);
- UNUSED_PARAMETER(check_only);
-
rc = APLWC_INVALID_SYNTAX;;
c = peek(state);
if(c != '\'')
@@ -277,7 +266,7 @@ text(struct scan_state *state, struct token_list *tokens, size_t token_index, in
do
c = advance(state);
- while((c != '\n') && (c != 0) && (c != '\''));
+ while((c != '\n') && (c != INVALID_CHAR) && (c != '\''));
if(c == '\'')
advance(state);
@@ -292,7 +281,7 @@ end:
}
static enum aplwc_rc
-comment(struct scan_state *state, struct token_list *tokens, size_t token_index, int check_only)
+comment(struct scan_state *state, struct token_list *tokens, size_t token_index)
{
uint32_t c;
enum aplwc_rc rc;
@@ -300,8 +289,6 @@ comment(struct scan_state *state, struct token_list *tokens, size_t token_index,
MEMPTRS(state->aplwc, 1);
MEMPTR(0, tokens);
- UNUSED_PARAMETER(check_only);
-
rc = APLWC_INVALID_SYNTAX;
c = peek(state);
if(c != 0x235D)
@@ -319,11 +306,11 @@ end:
}
static enum aplwc_rc
-next_token(struct scan_state *state, struct token_list *tokens, size_t token_index, int check_only)
+next_token(struct scan_state *state, struct token_list *tokens, size_t token_index)
{
enum aplwc_rc rc;
size_t i;
- enum aplwc_rc (*scans[])(struct scan_state *, struct token_list *, size_t, int) = {
+ enum aplwc_rc (*scans[])(struct scan_state *, struct token_list *, size_t) = {
identifier,
keyword,
number,
@@ -338,12 +325,12 @@ next_token(struct scan_state *state, struct token_list *tokens, size_t token_ind
T.start = state->offset;
rc = APLWC_INVALID_SYNTAX;
for(i = 0; (rc == APLWC_INVALID_SYNTAX) && (i < NELEM(scans)); i++){
- rc = scans[i](state, tokens, token_index, check_only);
+ rc = scans[i](state, tokens, token_index);
switch(rc){
case APLWC_OK:
break;
case APLWC_INVALID_SYNTAX:
- state->offset = tokens->tokens[token_index].start;
+ state->offset = T.start;
break;
default:
goto end;
@@ -374,11 +361,13 @@ check(struct aplwc *aplwc, struct string *text, size_t *n)
goto end;
}
MEMPTR(1, tokens);
+ tokens->text = text;
+ tokens->length = 1;
init_scan_state(&state, aplwc, &text);
- for(count = 0; peek(&state); count++){
- ret = next_token(&state, tokens, 0, 1);
+ for(count = 0; peek(&state) != INVALID_CHAR; count++){
+ ret = next_token(&state, tokens, 0);
if(ret != APLWC_OK)
goto end;
}
@@ -404,8 +393,9 @@ scan(struct aplwc *aplwc, struct string *text, struct token_list *tokens)
init_scan_state(&state, aplwc, &text);
ret = APLWC_OK;
- for(count = 0; (ret == APLWC_OK) && peek(&state); count++){
- ret = next_token(&state, tokens, count, 0);
+ for(count = 0; (ret == APLWC_OK) && (peek(&state) != INVALID_CHAR); count++){
+ assert(count < tokens->length);
+ ret = next_token(&state, tokens, count);
}
MEMPTRS_EXIT(aplwc);
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-14 23:23:44 +0000