prenex/slc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed line numbering for double lines; faster turning off for defname; start state setter macro for safer code to not forget things

Browse Source
This commit is contained in:
Richard Thier 2024-09-28 23:21:49 +02:00
parent 2b2cc47d7a
commit c74ed39ef1
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
engine/slc.h
View File

@ -355,6 +355,8 @@ static inline slc_state slc_def_name_statechange(
if(c == ':') { if(c == ':') {
*prefix_i = 0; /* XXX: restarts scan */ *prefix_i = 0; /* XXX: restarts scan */
return SLC_WORD_NAME; return SLC_WORD_NAME;
} else {
*prefix_i = -1;
} }
} }
@ -376,6 +378,14 @@ static inline slc_state slc_word_statechange(
return current_state; return current_state;
} }
#define SLC_SET_START_STATE \
comment_i = 0; \
multiline_i = 0; \
prefix_i = 0; \
wordname_i = 0; \
wordname[0] = 0; \
state = SLC_START;
/** /**
* This function runs the main slc engine over a snippet of code. * This function runs the main slc engine over a snippet of code.
* *
@ -438,21 +448,23 @@ static inline void slc(
char is_indenting = 1; char is_indenting = 1;
int indent = 0; int indent = 0;
slc_state state = SLC_START; slc_state state;
int comment_i;
int comment_i = 0; int multiline_i;
int multiline_i = 0; int prefix_i;
int prefix_i = 0; int wordname_i;
int wordname_i = 0;
char wordname[SL_MAX_WORD_NAME + 1]; char wordname[SL_MAX_WORD_NAME + 1];
SLC_SET_START_STATE
char prevc = 0; char prevc = 0;
char c = 0; char c = 0;
while(((c = code_src()) != 0)) { while(((c = code_src()) != 0)) {
/* Handle lines and columns, parts of indenting */ /* Handle lines and columns, parts of indenting */
if(endsline(c)) { if(endsline(c)) {
/* Handles \n, \r, \r\n and \n\r this way and counts empty lines properly */ /* Handles \n, \r, \r\n and \n\r this way and counts empty lines properly */
if((prevc != c) || !last_is_endl) { /* De-Morgan (!a || b) == (a => b) so (last_is_endl => (prevc == c)) */
if(!last_is_endl || (prevc == c)) {
++line; ++line;
col = 0; col = 0;
/* Indent part */ /* Indent part */
@ -515,6 +527,7 @@ static inline void slc(
&multiline_i); &multiline_i);
break; break;
case SLC_DEF_NAME: case SLC_DEF_NAME:
// TODO
break; break;
case SLC_DEF_VAR: case SLC_DEF_VAR:
break; break;