hyung-hwan/hak
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added pragma liberal on/off

Browse Source
This commit is contained in:
hyung-hwan
2025-09-22 20:19:35 +09:00
parent a0fd6c5048
commit 6b0cf766ce
7 changed files with 71 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/comp.c
View File

@ -3655,7 +3655,6 @@ static int compile_fun (hak_t* hak, hak_cnode_t* src)
/*
* fun aa(a b) { ... };
* (fun aa(a b) { ... })
*
* the block expression must be the first and the only expression at the body position.
* the variable declaration can't be placed before the block expression.
@ -4256,14 +4255,14 @@ static int compile_try (hak_t* hak, hak_cnode_t* src)
HAK_ASSERT(hak, HAK_CNODE_IS_TYPED(HAK_CNODE_CONS_CAR(src), HAK_CNODE_TRY));
/* (try
* (perform this)
* (perform that)
* (throw 10)
* catch (x)
* (perform xxx)
* (perform yyy)
* )
/* try {
* perform this
* perform that
* throw 10
* } catch (x) {
* perform xxx
* perform yyy
* }
*/
cmd = HAK_CNODE_CONS_CAR(src);
obj = HAK_CNODE_CONS_CDR(src);
@ -6981,11 +6980,11 @@ int hak_compile (hak_t* hak, hak_cnode_t* obj, int flags)
* frame base can be 0. The means it is ok for a top-level code to
* reference part of the literal frame reserved for a function.
*
* (set b 1)
* (fun set-a(x) (set a x))
* (set a 2)
* (set-a 4)
* (printf "%d\n" a)
* set b 1
* fun set-a(x) { set a x }
* set a 2
* set-a 4
* printf "%d\n" a
*
* the global literal frame looks like this:
* @0 (b)

4
lib/exec.c
View File

@ -5033,12 +5033,12 @@ hak_logbfmt(hak, HAK_LOG_STDERR, ">>>%O c->sc=%O sc=%O b2=%d b3=%d nivars=%d ncv
hak_oow_t x;
hak_oop_block_t blkobj;
/* block temporaries mask (extended long)
* literal frame index to name (extended long) */
/* block temporaries mask (extended long) */
FETCH_PARAM_CODE_TO(hak, b1);
FETCH_PARAM_CODE_TO(hak, x);
b1 = (b1 << (8 * HAK_CODE_LONG_PARAM_SIZE)) | x;
/* literal frame index to name (extended long) */
FETCH_PARAM_CODE_TO(hak, b2);
FETCH_PARAM_CODE_TO(hak, x);
b2 = (b2 << (8 * HAK_CODE_LONG_PARAM_SIZE)) | x;

8
lib/hak-prv.h
View File

@ -824,12 +824,6 @@ struct hak_flx_pi_t
int is_cla; /* class-level accrssor. prefixed with self/super */
};
typedef struct hak_flx_binop_t hak_flx_binop_t;
struct hak_flx_binop_t
{
hak_oow_t _not_used;
};
typedef struct hak_flx_pn_t hak_flx_pn_t;
struct hak_flx_pn_t
{
@ -893,7 +887,6 @@ enum hak_flx_state_t
HAK_FLX_HMARKED_CHAR, /* hash-marked character that begins with #\ */
HAK_FLX_HMARKED_IDENT, /* literal symbol */
HAK_FLX_PLAIN_IDENT, /* plain identifier */
HAK_FLX_BINOP, /* binary operator */
HAK_FLX_PLAIN_NUMBER, /* plain number */
HAK_FLX_QUOTED_TOKEN, /* string, character */
HAK_FLX_SIGNED_TOKEN, /* prefixed with + or - */
@ -986,7 +979,6 @@ struct hak_compiler_t
hak_flx_hi_t hi; /* hash-marked identifier - literal symbol */
hak_flx_hbc_t hbc; /* #b #c ... */
hak_flx_pi_t pi; /* plain identifier */
hak_flx_binop_t binop; /* binary operator */
hak_flx_pn_t pn; /* plain number */
hak_flx_qt_t qt; /* quoted token */
hak_flx_st_t st; /* signed token */

3
lib/hak.h
View File

@ -240,6 +240,9 @@ enum hak_trait_t
/* return EOL as a token */ /* TODO: make this pragma controllable */
HAK_TRAIT_LANG_ENABLE_EOL = (((hak_bitmask_t)1) << 14),
/* TODO: make this pragma controllable */
HAK_TRAIT_LANG_LIBERAL = ((hak_bitmask_t)1) << 15
};
typedef enum hak_trait_t hak_trait_t;

122
lib/read.c
View File

@ -97,6 +97,10 @@ static struct voca_t
{ 3, { '[',' ',']' /* TUPLE */ } },
{ 3, { '|',' ','|' /* VLIST */ } },
{ 7, { 'l','i','b','e','r','a','l' } },
{ 2, { 'o','n' } },
{ 3, { 'o','f','f' } },
{ 5, { '<','E','O','L','>' } },
{ 5, { '<','E','O','F','>' } }
};
@ -160,6 +164,10 @@ enum voca_id_t
VOCA_TUPLE,
VOCA_VLIST,
VOCA_PRG_LIBERAL,
VOCA_PRG_ON,
VOCA_PRG_OFF,
VOCA_EOL,
VOCA_EOF
};
@ -299,7 +307,7 @@ static HAK_INLINE int is_binop_char (hak_ooci_t c)
static HAK_INLINE int is_pure_lead_ident_char (hak_ooci_t c)
{
return hak_is_ooch_alnum(c) || c == '_';
return hak_is_ooch_alpha(c) || c == '_';
}
static HAK_INLINE int is_pure_ident_char (hak_ooci_t c)
@ -309,11 +317,7 @@ static HAK_INLINE int is_pure_ident_char (hak_ooci_t c)
static HAK_INLINE int is_lead_ident_char (hak_ooci_t c)
{
#if defined(STRICT_BINOP)
return hak_is_ooch_alpha(c) || c == '_';
#else
return hak_is_ooch_alnum(c) || c == '_' || c == '-' || c == '?' || is_binop_char(c);
#endif
return hak_is_ooch_alpha(c) || c == '_' || c == '-' || c == '?' || is_binop_char(c);
}
static HAK_INLINE int is_ident_char (hak_ooci_t c)
@ -322,11 +326,7 @@ static HAK_INLINE int is_ident_char (hak_ooci_t c)
* '-' is prohibited as the last character of an identifier or an identifier segment.
* see flx_plain_ident().
*/
#if defined(STRICT_BINOP)
return hak_is_ooch_alnum(c) || c == '_' || c == '-' || c == '?';
#else
return hak_is_ooch_alnum(c) || c == '_' || c == '-' || c == '?' || is_binop_char(c);
#endif
}
/* TODO: remove GET_CHAR(), GET_CHAR_TO(), get_char(), _get_char() */
@ -579,14 +579,15 @@ static int classify_ident_token (hak_t* hak, const hak_oocs_t* v, const hak_loc_
return 0;
}
if (binop_char_count > 0)
if (binop_char_count > 0 && !(hak->option.trait & HAK_TRAIT_LANG_LIBERAL))
{
hak_setsynerrbfmt(hak, HAK_SYNERR_ILTOK, errloc, HAK_NULL,
"illegal identifier '%.*js'", v->len, v->ptr);
return -1;
}
*tok_type = HAK_TOK_SYMLIT;
/**tok_type = HAK_TOK_SYMLIT;*/
*tok_type = HAK_TOK_STRLIT;
return 0;
}
@ -782,7 +783,7 @@ static HAK_INLINE hak_cnode_t* leave_list (hak_t* hak, hak_loc_t* list_loc, int*
lcar = HAK_CNODE_CONS_CAR(tmp);
if (!HAK_CNODE_IS_SYMBOL(lcar) && !HAK_CNODE_IS_DSYMBOL_CLA(lcar))
{
hak_setsynerrbfmt(hak, HAK_SYNERR_LVALUE, HAK_CNODE_GET_LOC(lval), HAK_CNODE_GET_TOK(lval), "bad lvalue - invalid element in tuple");
hak_setsynerrbfmt(hak, HAK_SYNERR_LVALUE, HAK_CNODE_GET_LOC(lval), HAK_CNODE_GET_TOK(lval), "bad lvalue - invalid identifier in tuple");
goto oops;
}
}
@ -808,7 +809,7 @@ static HAK_INLINE hak_cnode_t* leave_list (hak_t* hak, hak_loc_t* list_loc, int*
{
if (!HAK_CNODE_IS_SYMBOL(lval) && !HAK_CNODE_IS_DSYMBOL_CLA(lval))
{
hak_setsynerrbfmt(hak, HAK_SYNERR_LVALUE, HAK_CNODE_GET_LOC(lval), HAK_CNODE_GET_TOK(lval), "bad lvalue - invalid element");
hak_setsynerrbfmt(hak, HAK_SYNERR_LVALUE, HAK_CNODE_GET_LOC(lval), HAK_CNODE_GET_TOK(lval), "bad lvalue - invalid identifier");
goto oops;
}
#if defined(TRANSFORM_ALIST)
@ -1570,7 +1571,7 @@ static int feed_process_token (hak_t* hak)
if (frd->expect_pragma_item)
{
/* the pragmas changes the behavior of the reader and the compiler */
if (frd->expect_pragma_item >= 3) /* eol expected */
if (frd->expect_pragma_item <= -1) /* eol expected */
{
if (TOKEN_TYPE(hak) != HAK_TOK_EOL && TOKEN_TYPE(hak) != HAK_TOK_SEMICOLON)
{
@ -1604,12 +1605,38 @@ static int feed_process_token (hak_t* hak)
if (frd->expect_pragma_item == 1)
{
/* TODO: add items .. */
frd->expect_pragma_item = 2; /* expect value */
if (does_token_name_match(hak, VOCA_PRG_LIBERAL))
{
frd->expect_pragma_item = 501; /* expect value */
}
/* TODO: more pragmas */
else
{
hak_setsynerrbfmt(hak, HAK_SYNERR_IDENT, TOKEN_LOC(hak), HAK_NULL,
"invalid pragma name '%.*js'",
TOKEN_NAME_LEN(hak), TOKEN_NAME_PTR(hak));
goto oops;
}
}
else if (frd->expect_pragma_item == 501)
{
if (does_token_name_match(hak, VOCA_PRG_ON))
{
hak->option.trait |= HAK_TRAIT_LANG_LIBERAL;
}
else if (does_token_name_match(hak, VOCA_PRG_OFF))
{
hak->option.trait &= ~HAK_TRAIT_LANG_LIBERAL;
}
else
{
frd->expect_pragma_item = 3; /* expect eol */
hak_setsynerrbfmt(hak, HAK_SYNERR_IDENT, TOKEN_LOC(hak), HAK_NULL,
"invalid pragma value '%.*js'",
TOKEN_NAME_LEN(hak), TOKEN_NAME_PTR(hak));
goto oops;
}
frd->expect_pragma_item = -1; /* expect eol */
}
}
goto ok;
@ -2368,7 +2395,6 @@ static int feed_continue_with_char (hak_t* hak, hak_ooci_t c, hak_flx_state_t st
#define FLX_HN(hak) (&((hak)->c->feed.lx.u.hn))
#define FLX_HI(hak) (&((hak)->c->feed.lx.u.hi))
#define FLX_PI(hak) (&((hak)->c->feed.lx.u.pi))
#define FLX_BINOP(hak) (&((hak)->c->feed.lx.u.binop))
#define FLX_PN(hak) (&((hak)->c->feed.lx.u.pn))
#define FLX_QT(hak) (&((hak)->c->feed.lx.u.qt))
#define FLX_ST(hak) (&((hak)->c->feed.lx.u.st))
@ -2412,11 +2438,6 @@ static HAK_INLINE void init_flx_pi (hak_flx_pi_t* pi)
HAK_MEMSET(pi, 0, HAK_SIZEOF(*pi));
}
static HAK_INLINE void init_flx_binop (hak_flx_binop_t* binop)
{
HAK_MEMSET(binop, 0, HAK_SIZEOF(*binop));
}
static HAK_INLINE void init_flx_pn (hak_flx_pn_t* pn, hak_ooch_t start_digit)
{
HAK_MEMSET(pn, 0, HAK_SIZEOF(*pn));
@ -2551,14 +2572,6 @@ static int flx_start (hak_t* hak, hak_ooci_t c)
goto consumed;
default:
#if defined(STRICT_BINOP)
if (is_binop_char(c))
{
init_flx_binop(FLX_BINOP(hak));
FEED_CONTINUE(hak, HAK_FLX_BINOP);
}
else
#endif
if (is_lead_ident_char(c))
{
init_flx_pi(FLX_PI(hak));
@ -2730,15 +2743,6 @@ static int flx_hmarked_token (hak_t* hak, hak_ooci_t c)
* #"..." symbol literal
*/
#if defined(STRICT_BINOP)
if (is_binop_char(c))
{
reset_flx_token(hak);
FEED_CONTINUE_WITH_CHAR(hak, c, HAK_FLX_HMARKED_BINOP);
goto consumed;
}
#endif
switch (c)
{
case '#':
@ -3124,30 +3128,6 @@ not_consumed:
return 0;
}
static int flx_binop (hak_t* hak, hak_ooci_t c) /* binary operator/selector */
{
#if 0
hak_flx_binop_t* binop = FLX_BINOP(hak);
#endif
if (is_binop_char(c))
{
ADD_TOKEN_CHAR(hak, c);
goto consumed;
}
else
{
FEED_WRAP_UP(hak, HAK_TOK_BINOP);
goto not_consumed;
}
consumed:
return 1;
not_consumed:
return 0;
}
static int flx_plain_number (hak_t* hak, hak_ooci_t c) /* number */
{
hak_flx_pn_t* pn = FLX_PN(hak);
@ -3473,16 +3453,6 @@ static int flx_signed_token (hak_t* hak, hak_ooci_t c)
}
else
{
#if defined(STRICT_BINOP)
/* the leading sign must be + or - and must be one of the binop chars. */
HAK_ASSERT(hak, is_binop_char(st->sign_c));/* must be + or - and they must be one of the binop chars. */
/* switch to binop mode */
init_flx_binop(FLX_BINOP(hak));
HAK_ASSERT(hak, TOKEN_NAME_LEN(hak) == 1);
FEED_CONTINUE(hak, HAK_FLX_BINOP);
goto not_consumed;
#else
init_flx_pi(FLX_PI(hak));
/* the sign is already in the token name buffer.
@ -3494,7 +3464,6 @@ static int flx_signed_token (hak_t* hak, hak_ooci_t c)
/* let refeeding of 'c' happen at the next iteration */
FEED_CONTINUE(hak, HAK_FLX_PLAIN_IDENT);
goto not_consumed;
#endif
}
consumed:
@ -3568,7 +3537,6 @@ static int feed_char (hak_t* hak, hak_ooci_t c)
case HAK_FLX_HMARKED_IDENT: return flx_hmarked_ident(hak, c);
case HAK_FLX_PLAIN_IDENT: return flx_plain_ident(hak, c);
case HAK_FLX_BINOP: return flx_binop(hak, c);
case HAK_FLX_PLAIN_NUMBER: return flx_plain_number(hak, c);
case HAK_FLX_QUOTED_TOKEN: return flx_quoted_token(hak, c);
case HAK_FLX_SIGNED_TOKEN: return flx_signed_token(hak, c);

14
t/feed-5001.err
View File

@ -138,19 +138,15 @@ printf if; ##ERROR: syntax error - 'if' prohibited in this context
---
#**a ##ERROR: syntax error - invalid binary selector character 'a' after #**
abc- := 20 ##ERROR: syntax error - illegal identifier 'abc-'
---
abc- := 20 ##ERROR: syntax error - '-' prohibited as last character of identifier or identifier segment
self.g- := 20 ##ERROR: syntax error - illegal identifier 'g-'
---
self.g- := 20 ##ERROR: syntax error - wrong multi-segment identifier - self.g-
---
self.-g := 20 ##ERROR: syntax error - wrong multi-segment identifier - self.-g
self.-g := 20 ##ERROR: syntax error - illegal identifier '-g'
---
@ -167,11 +163,11 @@ abc.? := 20 ##ERROR: syntax error - wrong multi-segment identifier - abc.?
---
- := 20 ##ERROR: syntax error - bad lvalue - invalid element - -
- := 20 ##ERROR: syntax error - bad lvalue - invalid identifier - -
---
+++ := 20 ##ERROR: syntax error - bad lvalue - invalid element - +++
+++ := 20 ##ERROR: syntax error - bad lvalue - invalid identifier - +++
---

4
t/var-5001.err
View File

@ -58,12 +58,12 @@ class A ( + ) { ##ERROR: syntax error - not variable name '+'
---
fun xxx(x :: p q) { p := (x + 1); q := (x + 2) }
[a,[b]] := (xxx 20) ##ERROR: syntax error - bad lvalue - invalid element in tuple
[a,[b]] := (xxx 20) ##ERROR: syntax error - bad lvalue - invalid identifier in tuple
printf "%d %d\n" a b
---
20 := 90 ##ERROR: syntax error - bad lvalue - invalid element - 20
20 := 90 ##ERROR: syntax error - bad lvalue - invalid identifier - 20
---