Compare commits
1 Commits
9ea5af67ae
...
46
| Author | SHA1 | Date | |
|---|---|---|---|
| 7c3e4e3081 |
@@ -9,7 +9,6 @@ so a call with the wrong number is a syntax error rather than a surprise.
|
|||||||
| Function | Args | Form | What it gives |
|
| Function | Args | Form | What it gives |
|
||||||
|---|---|---|---|
|
|---|---|---|---|
|
||||||
| `ABS` | 1 | `ABS(n)` | The absolute value of an integer or float. |
|
| `ABS` | 1 | `ABS(n)` | The absolute value of an integer or float. |
|
||||||
| `ASC` | 1 | `ASC(A$)` | The Unicode code point of a string's first character. |
|
|
||||||
| `ATN` | 1 | `ATN(n)` | Arctangent, in radians. |
|
| `ATN` | 1 | `ATN(n)` | Arctangent, in radians. |
|
||||||
| `BUMP` | 1 | `BUMP(1)` | Which sprites have collided, as a bitmask. **Reading clears it.** |
|
| `BUMP` | 1 | `BUMP(1)` | Which sprites have collided, as a bitmask. **Reading clears it.** |
|
||||||
| `CHR` | 1 | `CHR(n)` | The character for a Unicode code point, as a string. |
|
| `CHR` | 1 | `CHR(n)` | The character for a Unicode code point, as a string. |
|
||||||
@@ -30,7 +29,6 @@ so a call with the wrong number is a syntax error rather than a surprise.
|
|||||||
| `RGR` | 1 | `RGR(f)` | The `GRAPHIC` mode (0), the drawing surface's width (1) or height (2) in pixels, or a character cell's width (3) or height (4). |
|
| `RGR` | 1 | `RGR(f)` | The `GRAPHIC` mode (0), the drawing surface's width (1) or height (2) in pixels, or a character cell's width (3) or height (4). |
|
||||||
| `RIGHT` | 2 | `RIGHT(A$, n)` | The rightmost `n` characters. Clamped. |
|
| `RIGHT` | 2 | `RIGHT(A$, n)` | The rightmost `n` characters. Clamped. |
|
||||||
| `RMENU` | 2 | `RMENU(n, f)` | A menu's state: field 0 the highlighted entry, field 1 whether it has been confirmed. **Reading field 1 clears it.** |
|
| `RMENU` | 2 | `RMENU(n, f)` | A menu's state: field 0 the highlighted entry, field 1 whether it has been confirmed. **Reading field 1 clears it.** |
|
||||||
| `RND` | 1 | `RND(n)` | A random integer from 0 up to but not including `n`. |
|
|
||||||
| `RWINDOW` | 1 | `RWINDOW(f)` | The current text window's rows (0) or columns (1). Field 2 is a C128 screen mode and is refused. |
|
| `RWINDOW` | 1 | `RWINDOW(f)` | The current text window's rows (0) or columns (1). Field 2 is a C128 screen mode and is refused. |
|
||||||
| `RSPCOLOR` | 1 | `RSPCOLOR(n)` | One of `SPRCOLOR`'s two shared registers, 1 or 2. |
|
| `RSPCOLOR` | 1 | `RSPCOLOR(n)` | One of `SPRCOLOR`'s two shared registers, 1 or 2. |
|
||||||
| `RSPHIT` | 2 | `RSPHIT(n, f)` | One of `SPRHIT`'s settings for sprite `n`, in `SPRHIT`'s own argument order: 0 the kind, 1 to 4 the two corners. |
|
| `RSPHIT` | 2 | `RSPHIT(n, f)` | One of `SPRHIT`'s settings for sprite `n`, in `SPRHIT`'s own argument order: 0 the kind, 1 to 4 the two corners. |
|
||||||
|
|||||||
@@ -1005,48 +1005,20 @@ IF NUDGE# = 1 THEN GOSUB UNSTICK
|
|||||||
LABEL UNSTICK
|
LABEL UNSTICK
|
||||||
NUDGE# = 0
|
NUDGE# = 0
|
||||||
STALL# = 0
|
STALL# = 0
|
||||||
BVX# = (RND(4) * 3) - 6
|
RMAX# = 4
|
||||||
|
GOSUB RANDOM
|
||||||
|
BVX# = (RND# * 3) - 6
|
||||||
IF BVX# = 0 THEN BVX# = 3
|
IF BVX# = 0 THEN BVX# = 3
|
||||||
RETURN
|
RETURN
|
||||||
```
|
```
|
||||||
|
|
||||||
### Random numbers are built in
|
### You have to write your own random numbers
|
||||||
|
|
||||||
There is no `INT`, `SQR` or `TIMER` in this dialect, but
|
**There is no `RND` in this dialect**, and no `INT`, `SQR`, `ASC` or `TIMER` either. A
|
||||||
`RND(n)` returns an integer from zero through `n - 1`. It seeds itself
|
linear congruential generator is nine tokens and does the job. Put the number of possible
|
||||||
from the host clock the first time it is called, so a program only needs the bound:
|
answers in `RMAX#` and read the result from `RND#`:
|
||||||
|
|
||||||
```basic
|
```basic
|
||||||
I# = 0
|
|
||||||
FOR I# = 1 TO 5
|
|
||||||
PRINT "ROLL " + (RND(6) + 1)
|
|
||||||
NEXT I#
|
|
||||||
END
|
|
||||||
```
|
|
||||||
|
|
||||||
Use `RND` for the serve, too, so the ball does not always leave in the same direction:
|
|
||||||
|
|
||||||
```basic norun
|
|
||||||
LABEL SERVE
|
|
||||||
PX# = (SCW# - PW#) / 2
|
|
||||||
HELD# = 1
|
|
||||||
BX# = PX# + ((PW# / 2) - 4)
|
|
||||||
BY# = PY# - 10
|
|
||||||
BVX# = BSPD#
|
|
||||||
IF RND(2) = 0 THEN BVX# = 0 - BSPD#
|
|
||||||
BVY# = 0 - BSPD#
|
|
||||||
PDEC# = 0
|
|
||||||
GOSUB SHOWSPR
|
|
||||||
RETURN
|
|
||||||
```
|
|
||||||
|
|
||||||
<details>
|
|
||||||
<summary>Historical aside: the LCG this chapter used to teach</summary>
|
|
||||||
|
|
||||||
Before `RND` existed, this nine-token linear congruential generator was copied into
|
|
||||||
every program. It remains a useful from-scratch PRNG example:
|
|
||||||
|
|
||||||
```basic norun
|
|
||||||
SEED# = 12345
|
SEED# = 12345
|
||||||
RMAX# = 6
|
RMAX# = 6
|
||||||
RND# = 0
|
RND# = 0
|
||||||
@@ -1063,11 +1035,43 @@ RND# = MOD((SEED# / 65536), RMAX#)
|
|||||||
RETURN
|
RETURN
|
||||||
```
|
```
|
||||||
|
|
||||||
The multiplication stays inside a 64-bit integer for any seed below 2147483648. The
|
```output
|
||||||
answer is taken from the middle bits because the low bits of a power-of-two modulus
|
ROLL 1
|
||||||
barely change from one call to the next. This used to be required; it is now built in.
|
ROLL 5
|
||||||
|
ROLL 2
|
||||||
|
ROLL 1
|
||||||
|
ROLL 2
|
||||||
|
```
|
||||||
|
|
||||||
</details>
|
The multiplication stays inside a 64-bit integer for any seed below 2147483648, which is
|
||||||
|
why the modulus is that number. The answer is taken from the middle bits — `SEED# / 65536`
|
||||||
|
— because the low bits of a power-of-two modulus barely change from one call to the next.
|
||||||
|
Integer division truncating for free is the `INT` you do not have.
|
||||||
|
|
||||||
|
Seed it from the clock at startup. `TI#` is the host's uptime in sixtieths of a second,
|
||||||
|
which is different every time the game is run:
|
||||||
|
|
||||||
|
```basic norun
|
||||||
|
SEED# = TI#
|
||||||
|
```
|
||||||
|
|
||||||
|
Use `RANDOM` for the serve, too, so the ball does not always leave in the same direction:
|
||||||
|
|
||||||
|
```basic norun
|
||||||
|
LABEL SERVE
|
||||||
|
PX# = (SCW# - PW#) / 2
|
||||||
|
HELD# = 1
|
||||||
|
BX# = PX# + ((PW# / 2) - 4)
|
||||||
|
BY# = PY# - 10
|
||||||
|
RMAX# = 2
|
||||||
|
GOSUB RANDOM
|
||||||
|
BVX# = BSPD#
|
||||||
|
IF RND# = 0 THEN BVX# = 0 - BSPD#
|
||||||
|
BVY# = 0 - BSPD#
|
||||||
|
PDEC# = 0
|
||||||
|
GOSUB SHOWSPR
|
||||||
|
RETURN
|
||||||
|
```
|
||||||
|
|
||||||
`HELD#` is the flag Step 6's loop tests: while it is 1 the ball sits on the paddle, and
|
`HELD#` is the flag Step 6's loop tests: while it is 1 the ball sits on the paddle, and
|
||||||
`HOLDBAL` keeps it there:
|
`HOLDBAL` keeps it there:
|
||||||
@@ -1418,7 +1422,9 @@ PX# = PX# + D#
|
|||||||
RETURN
|
RETURN
|
||||||
|
|
||||||
LABEL DEMOAIM
|
LABEL DEMOAIM
|
||||||
DOFF# = RND(81) - 40
|
RMAX# = 81
|
||||||
|
GOSUB RANDOM
|
||||||
|
DOFF# = RND# - 40
|
||||||
RETURN
|
RETURN
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -1495,7 +1501,7 @@ This is the shape of the whole file:
|
|||||||
LABEL SETUP the geometry from Step 2
|
LABEL SETUP the geometry from Step 2
|
||||||
the declaration block from Step 3
|
the declaration block from Step 3
|
||||||
the brick faces from Step 5
|
the brick faces from Step 5
|
||||||
RND(n) seeds itself from the host clock
|
SEED# = TI#
|
||||||
the ceiling from Step 9
|
the ceiling from Step 9
|
||||||
GOSUB MKSPR Step 4
|
GOSUB MKSPR Step 4
|
||||||
GOSUB SNDPROBE Step 14
|
GOSUB SNDPROBE Step 14
|
||||||
@@ -1570,7 +1576,10 @@ BB# = 0
|
|||||||
RX# = 0
|
RX# = 0
|
||||||
N# = 0
|
N# = 0
|
||||||
MROW# = 0
|
MROW# = 0
|
||||||
|
RMAX# = 2
|
||||||
|
RND# = 0
|
||||||
SND# = 0
|
SND# = 0
|
||||||
|
SEED# = 0
|
||||||
P$ = ""
|
P$ = ""
|
||||||
H$ = ""
|
H$ = ""
|
||||||
S$ = ""
|
S$ = ""
|
||||||
|
|||||||
@@ -105,6 +105,8 @@ typedef struct
|
|||||||
* Registering before the script is loaded is the normal case. A host type and a
|
* Registering before the script is loaded is the normal case. A host type and a
|
||||||
* `TYPE` the script declares share one namespace, so a script cannot declare a
|
* `TYPE` the script declares share one namespace, so a script cannot declare a
|
||||||
* type the host already registered -- and would be refused if it tried.
|
* type the host already registered -- and would be refused if it tried.
|
||||||
|
* Host type and field names are limited to 31 characters, matching
|
||||||
|
* script-declared types and fields.
|
||||||
*
|
*
|
||||||
* @param obj Object to initialize, inspect, or modify.
|
* @param obj Object to initialize, inspect, or modify.
|
||||||
* @param type The host's description of its own struct.
|
* @param type The host's description of its own struct.
|
||||||
@@ -112,6 +114,7 @@ typedef struct
|
|||||||
* @throws AKERR_NULLPOINTER When either argument is NULL.
|
* @throws AKERR_NULLPOINTER When either argument is NULL.
|
||||||
* @throws AKBASIC_ERR_VALUE When a field name carries no type suffix, a nested
|
* @throws AKBASIC_ERR_VALUE When a field name carries no type suffix, a nested
|
||||||
* type is not registered, or the name is already taken.
|
* type is not registered, or the name is already taken.
|
||||||
|
* @throws AKERR_OUTOFBOUNDS When a type or field name exceeds 31 characters.
|
||||||
* @throws AKBASIC_ERR_BOUNDS When the type table or a field list is full.
|
* @throws AKBASIC_ERR_BOUNDS When the type table or a field list is full.
|
||||||
*/
|
*/
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_host_register_type(struct akbasic_Runtime *obj, const akbasic_HostType *type);
|
akerr_ErrorContext AKERR_NOIGNORE *akbasic_host_register_type(struct akbasic_Runtime *obj, const akbasic_HostType *type);
|
||||||
|
|||||||
@@ -252,11 +252,6 @@ typedef struct akbasic_Runtime
|
|||||||
*/
|
*/
|
||||||
int64_t timems;
|
int64_t timems;
|
||||||
|
|
||||||
/* RND's lazy seed state. The flag distinguishes an unseeded run from a
|
|
||||||
* legitimate LCG state of zero. */
|
|
||||||
int64_t rndseed;
|
|
||||||
bool rndseeded;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Set by a branch that has decided the remaining statements on its line
|
* Set by a branch that has decided the remaining statements on its line
|
||||||
* belong to the arm it did not take, and cleared at the top of every line.
|
* belong to the arm it did not take, and cleared at the top of every line.
|
||||||
|
|||||||
16
src/host.c
16
src/host.c
@@ -235,16 +235,9 @@ akerr_ErrorContext *akbasic_host_register_type(akbasic_Runtime *obj, const akbas
|
|||||||
|
|
||||||
dest = &obj->structtypes.types[obj->structtypes.count];
|
dest = &obj->structtypes.types[obj->structtypes.count];
|
||||||
PASS(errctx, aksl_memset(dest, 0, sizeof(*dest)));
|
PASS(errctx, aksl_memset(dest, 0, sizeof(*dest)));
|
||||||
/*
|
/* Host and script registration share the 32-byte-including-NUL limit for
|
||||||
* Raw snprintf, and a latent defect rather than a settled decision: a host
|
both type names and field names. */
|
||||||
* type name over 31 characters truncates silently here, and two that share a
|
PASS(errctx, aksl_strcpy(dest->name, sizeof(dest->name), type->name));
|
||||||
* 31-character prefix then collide in akbasic_structtype_find. scan_names()
|
|
||||||
* in structtype.c already refuses the same case for a script-declared type
|
|
||||||
* with an explicit limit message, so the two paths disagree. Converting this
|
|
||||||
* to aksl_strcpy is the fix and it is a behaviour change on a public
|
|
||||||
* registration call, so it wants its own issue rather than this port.
|
|
||||||
*/
|
|
||||||
snprintf(dest->name, sizeof(dest->name), "%s", type->name);
|
|
||||||
dest->used = true;
|
dest->used = true;
|
||||||
dest->ishost = true;
|
dest->ishost = true;
|
||||||
dest->hostsize = type->size;
|
dest->hostsize = type->size;
|
||||||
@@ -270,8 +263,7 @@ akerr_ErrorContext *akbasic_host_register_type(akbasic_Runtime *obj, const akbas
|
|||||||
"%s.%s must end in '%c' for the C type it describes",
|
"%s.%s must end in '%c' for the C type it describes",
|
||||||
type->name, src->name, suffix_for(src->kind));
|
type->name, src->name, suffix_for(src->kind));
|
||||||
|
|
||||||
/* Same silent truncation as the type name above, and the same fix. */
|
PASS(errctx, aksl_strcpy(field->name, sizeof(field->name), src->name));
|
||||||
snprintf(field->name, sizeof(field->name), "%s", src->name);
|
|
||||||
field->hostkind = src->kind;
|
field->hostkind = src->kind;
|
||||||
field->hostoffset = src->offset;
|
field->hostoffset = src->offset;
|
||||||
field->hostwidth = src->width;
|
field->hostwidth = src->width;
|
||||||
|
|||||||
@@ -183,69 +183,6 @@ akerr_ErrorContext *akbasic_fn_chr(akbasic_Runtime *obj, akbasic_ASTLeaf *expr,
|
|||||||
SUCCEED_RETURN(errctx);
|
SUCCEED_RETURN(errctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
akerr_ErrorContext *akbasic_fn_asc(akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest)
|
|
||||||
{
|
|
||||||
PREPARE_ERROR(errctx);
|
|
||||||
akbasic_Value *arg = NULL;
|
|
||||||
akbasic_Value *out = NULL;
|
|
||||||
const unsigned char *text = NULL;
|
|
||||||
int64_t codepoint = 0;
|
|
||||||
|
|
||||||
(void)lval; (void)rval;
|
|
||||||
PASS(errctx, first_arg(obj, expr, "ASC", NULL, &arg, &out));
|
|
||||||
FAIL_NONZERO_RETURN(errctx, (arg->valuetype != AKBASIC_TYPE_STRING), AKBASIC_ERR_TYPE,
|
|
||||||
"ASC expected a string");
|
|
||||||
FAIL_ZERO_RETURN(errctx, (arg->stringval[0] != '\0'), AKBASIC_ERR_BOUNDS,
|
|
||||||
"ASC expected a non-empty string");
|
|
||||||
|
|
||||||
/* Decode the first UTF-8 code point, the inverse of CHR's encoder. */
|
|
||||||
text = (const unsigned char *)arg->stringval;
|
|
||||||
if ( text[0] < 0x80 ) {
|
|
||||||
codepoint = text[0];
|
|
||||||
} else if ( (text[0] & 0xE0) == 0xC0 ) {
|
|
||||||
codepoint = ((int64_t)(text[0] & 0x1F) << 6) |
|
|
||||||
(text[1] & 0x3F);
|
|
||||||
} else if ( (text[0] & 0xF0) == 0xE0 ) {
|
|
||||||
codepoint = ((int64_t)(text[0] & 0x0F) << 12) |
|
|
||||||
((int64_t)(text[1] & 0x3F) << 6) |
|
|
||||||
(text[2] & 0x3F);
|
|
||||||
} else {
|
|
||||||
codepoint = ((int64_t)(text[0] & 0x07) << 18) |
|
|
||||||
((int64_t)(text[1] & 0x3F) << 12) |
|
|
||||||
((int64_t)(text[2] & 0x3F) << 6) |
|
|
||||||
(text[3] & 0x3F);
|
|
||||||
}
|
|
||||||
out->valuetype = AKBASIC_TYPE_INTEGER;
|
|
||||||
out->intval = codepoint;
|
|
||||||
*dest = out;
|
|
||||||
SUCCEED_RETURN(errctx);
|
|
||||||
}
|
|
||||||
|
|
||||||
akerr_ErrorContext *akbasic_fn_rnd(akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest)
|
|
||||||
{
|
|
||||||
PREPARE_ERROR(errctx);
|
|
||||||
akbasic_Value *arg = NULL;
|
|
||||||
akbasic_Value *out = NULL;
|
|
||||||
const int64_t modulus = 2147483648;
|
|
||||||
|
|
||||||
(void)lval; (void)rval;
|
|
||||||
PASS(errctx, first_arg(obj, expr, "RND", NULL, &arg, &out));
|
|
||||||
FAIL_NONZERO_RETURN(errctx, (arg->valuetype != AKBASIC_TYPE_INTEGER), AKBASIC_ERR_TYPE,
|
|
||||||
"RND expected an integer");
|
|
||||||
FAIL_ZERO_RETURN(errctx, (arg->intval > 0), AKBASIC_ERR_VALUE,
|
|
||||||
"RND count %" PRId64 " must be positive", arg->intval);
|
|
||||||
|
|
||||||
if ( !obj->rndseeded ) {
|
|
||||||
obj->rndseed = obj->timems % modulus;
|
|
||||||
obj->rndseeded = true;
|
|
||||||
}
|
|
||||||
obj->rndseed = (obj->rndseed * 1103515245 + 12345) % modulus;
|
|
||||||
out->valuetype = AKBASIC_TYPE_INTEGER;
|
|
||||||
out->intval = (obj->rndseed / 65536) % arg->intval;
|
|
||||||
*dest = out;
|
|
||||||
SUCCEED_RETURN(errctx);
|
|
||||||
}
|
|
||||||
|
|
||||||
akerr_ErrorContext *akbasic_fn_hex(akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest)
|
akerr_ErrorContext *akbasic_fn_hex(akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest)
|
||||||
{
|
{
|
||||||
PREPARE_ERROR(errctx);
|
PREPARE_ERROR(errctx);
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ static const akbasic_Verb VERBS[] = {
|
|||||||
{ "ABS", AKBASIC_TOK_FUNCTION, 1, NULL, akbasic_fn_abs },
|
{ "ABS", AKBASIC_TOK_FUNCTION, 1, NULL, akbasic_fn_abs },
|
||||||
{ "AND", AKBASIC_TOK_AND, -1, NULL, NULL },
|
{ "AND", AKBASIC_TOK_AND, -1, NULL, NULL },
|
||||||
{ "APPEND", AKBASIC_TOK_COMMAND, -1, akbasic_parse_arglist, akbasic_cmd_append },
|
{ "APPEND", AKBASIC_TOK_COMMAND, -1, akbasic_parse_arglist, akbasic_cmd_append },
|
||||||
{ "ASC", AKBASIC_TOK_FUNCTION, 1, NULL, akbasic_fn_asc },
|
|
||||||
{ "ATN", AKBASIC_TOK_FUNCTION, 1, NULL, akbasic_fn_atn },
|
{ "ATN", AKBASIC_TOK_FUNCTION, 1, NULL, akbasic_fn_atn },
|
||||||
{ "AUTO", AKBASIC_TOK_COMMAND_IMMEDIATE, -1, NULL, akbasic_cmd_auto },
|
{ "AUTO", AKBASIC_TOK_COMMAND_IMMEDIATE, -1, NULL, akbasic_cmd_auto },
|
||||||
{ "BACKUP", AKBASIC_TOK_COMMAND, -1, akbasic_parse_optional_arglist, akbasic_cmd_backup },
|
{ "BACKUP", AKBASIC_TOK_COMMAND, -1, akbasic_parse_optional_arglist, akbasic_cmd_backup },
|
||||||
@@ -147,7 +146,6 @@ static const akbasic_Verb VERBS[] = {
|
|||||||
{ "RGR", AKBASIC_TOK_FUNCTION, 1, NULL, akbasic_fn_rgr },
|
{ "RGR", AKBASIC_TOK_FUNCTION, 1, NULL, akbasic_fn_rgr },
|
||||||
{ "RIGHT", AKBASIC_TOK_FUNCTION, 2, NULL, akbasic_fn_right },
|
{ "RIGHT", AKBASIC_TOK_FUNCTION, 2, NULL, akbasic_fn_right },
|
||||||
{ "RMENU", AKBASIC_TOK_FUNCTION, 2, NULL, akbasic_fn_rmenu },
|
{ "RMENU", AKBASIC_TOK_FUNCTION, 2, NULL, akbasic_fn_rmenu },
|
||||||
{ "RND", AKBASIC_TOK_FUNCTION, 1, NULL, akbasic_fn_rnd },
|
|
||||||
{ "RSPCOLOR", AKBASIC_TOK_FUNCTION, 1, NULL, akbasic_fn_rspcolor },
|
{ "RSPCOLOR", AKBASIC_TOK_FUNCTION, 1, NULL, akbasic_fn_rspcolor },
|
||||||
{ "RSPHIT", AKBASIC_TOK_FUNCTION, 2, NULL, akbasic_fn_rsphit },
|
{ "RSPHIT", AKBASIC_TOK_FUNCTION, 2, NULL, akbasic_fn_rsphit },
|
||||||
{ "RSPPOS", AKBASIC_TOK_FUNCTION, 2, NULL, akbasic_fn_rsppos },
|
{ "RSPPOS", AKBASIC_TOK_FUNCTION, 2, NULL, akbasic_fn_rsppos },
|
||||||
|
|||||||
@@ -140,7 +140,6 @@ akerr_ErrorContext AKERR_NOIGNORE *akbasic_cmd_stop(struct akbasic_Runtime *obj,
|
|||||||
|
|
||||||
/* Function handlers -- src/runtime_functions.c */
|
/* Function handlers -- src/runtime_functions.c */
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_abs(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_abs(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_asc(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_atn(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_atn(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_chr(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_chr(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_cos(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_cos(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
||||||
@@ -155,7 +154,6 @@ akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_peek(struct akbasic_Runtime *obj,
|
|||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_pointer(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_pointer(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_pointervar(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_pointervar(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_rad(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_rad(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_rnd(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_right(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_right(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_sgn(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_sgn(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
||||||
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_shl(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
akerr_ErrorContext AKERR_NOIGNORE *akbasic_fn_shl(struct akbasic_Runtime *obj, akbasic_ASTLeaf *expr, akbasic_Value *lval, akbasic_Value *rval, akbasic_Value **dest);
|
||||||
|
|||||||
@@ -208,6 +208,72 @@ static void test_suffix_must_match_the_c_type(void)
|
|||||||
harness_stop();
|
harness_stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @brief Host names use the same bounded storage as script-declared names. */
|
||||||
|
static void test_registration_name_limits(void)
|
||||||
|
{
|
||||||
|
static const akbasic_HostField SHORT_FIELD[] = {
|
||||||
|
AKBASIC_HOST_FIELD( test_Enemy, hp, "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234#",
|
||||||
|
AKBASIC_HOSTFIELD_INT32 )
|
||||||
|
};
|
||||||
|
static const akbasic_HostField LONG_FIELD_A[] = {
|
||||||
|
AKBASIC_HOST_FIELD( test_Enemy, hp, "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456A#",
|
||||||
|
AKBASIC_HOSTFIELD_INT32 )
|
||||||
|
};
|
||||||
|
static const akbasic_HostField LONG_FIELD_B[] = {
|
||||||
|
AKBASIC_HOST_FIELD( test_Enemy, hp, "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456B#",
|
||||||
|
AKBASIC_HOSTFIELD_INT32 )
|
||||||
|
};
|
||||||
|
static const akbasic_HostType SHORT_TYPE = {
|
||||||
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ12345", sizeof(test_Enemy), SHORT_FIELD, 1
|
||||||
|
};
|
||||||
|
static const akbasic_HostType LONG_TYPE_A = {
|
||||||
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ123456A", sizeof(test_Enemy), SHORT_FIELD, 1
|
||||||
|
};
|
||||||
|
static const akbasic_HostType LONG_TYPE_B = {
|
||||||
|
"ABCDEFGHIJKLMNOPQRSTUVWXYZ123456B", sizeof(test_Enemy), SHORT_FIELD, 1
|
||||||
|
};
|
||||||
|
static const akbasic_HostType LONG_FIELD_TYPE_A = {
|
||||||
|
"LONGFIELDA", sizeof(test_Enemy), LONG_FIELD_A, 1
|
||||||
|
};
|
||||||
|
static const akbasic_HostType LONG_FIELD_TYPE_B = {
|
||||||
|
"LONGFIELDB", sizeof(test_Enemy), LONG_FIELD_B, 1
|
||||||
|
};
|
||||||
|
akerr_ErrorContext *raised = NULL;
|
||||||
|
|
||||||
|
TEST_REQUIRE_OK(harness_start(NULL));
|
||||||
|
TEST_REQUIRE_OK(akbasic_host_register_type(&HARNESS_RUNTIME, &SHORT_TYPE));
|
||||||
|
harness_stop();
|
||||||
|
|
||||||
|
TEST_REQUIRE_OK(harness_start(NULL));
|
||||||
|
raised = akbasic_host_register_type(&HARNESS_RUNTIME, &LONG_TYPE_A);
|
||||||
|
TEST_REQUIRE(raised != NULL, "an overlong type name must be refused");
|
||||||
|
TEST_REQUIRE_INT(raised->status, AKERR_OUTOFBOUNDS);
|
||||||
|
test_discard_error(raised);
|
||||||
|
raised = akbasic_host_register_type(&HARNESS_RUNTIME, &LONG_TYPE_B);
|
||||||
|
TEST_REQUIRE(raised != NULL, "a second long type name must fail cleanly");
|
||||||
|
TEST_REQUIRE_INT(raised->status, AKERR_OUTOFBOUNDS);
|
||||||
|
test_discard_error(raised);
|
||||||
|
harness_stop();
|
||||||
|
|
||||||
|
TEST_REQUIRE_OK(harness_start(NULL));
|
||||||
|
TEST_REQUIRE_OK(akbasic_host_register_type(&HARNESS_RUNTIME,
|
||||||
|
&(akbasic_HostType){
|
||||||
|
"SHORTFIELDS", sizeof(test_Enemy), SHORT_FIELD, 1
|
||||||
|
}));
|
||||||
|
harness_stop();
|
||||||
|
|
||||||
|
TEST_REQUIRE_OK(harness_start(NULL));
|
||||||
|
raised = akbasic_host_register_type(&HARNESS_RUNTIME, &LONG_FIELD_TYPE_A);
|
||||||
|
TEST_REQUIRE(raised != NULL, "an overlong field name must be refused");
|
||||||
|
TEST_REQUIRE_INT(raised->status, AKERR_OUTOFBOUNDS);
|
||||||
|
test_discard_error(raised);
|
||||||
|
raised = akbasic_host_register_type(&HARNESS_RUNTIME, &LONG_FIELD_TYPE_B);
|
||||||
|
TEST_REQUIRE(raised != NULL, "a second long field name must fail cleanly");
|
||||||
|
TEST_REQUIRE_INT(raised->status, AKERR_OUTOFBOUNDS);
|
||||||
|
test_discard_error(raised);
|
||||||
|
harness_stop();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief After unbinding, the name is refused rather than read.
|
* @brief After unbinding, the name is refused rather than read.
|
||||||
*
|
*
|
||||||
@@ -258,6 +324,7 @@ int main(void)
|
|||||||
test_conversion_refuses_rather_than_truncates();
|
test_conversion_refuses_rather_than_truncates();
|
||||||
test_copy_versus_point();
|
test_copy_versus_point();
|
||||||
test_suffix_must_match_the_c_type();
|
test_suffix_must_match_the_c_type();
|
||||||
|
test_registration_name_limits();
|
||||||
test_unbind_refuses_later_reads();
|
test_unbind_refuses_later_reads();
|
||||||
test_registration_survives_a_rerun();
|
test_registration_survives_a_rerun();
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +0,0 @@
|
|||||||
10 PRINT "97 : " + ASC("a")
|
|
||||||
20 PRINT "65 : " + ASC("A")
|
|
||||||
30 PRINT "64 : " + ASC("@")
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
97 : 97
|
|
||||||
65 : 65
|
|
||||||
64 : 64
|
|
||||||
@@ -162,26 +162,6 @@ int main(void)
|
|||||||
expect_int("A# = INSTR(\"HELLO\", \"LL\")", 2);
|
expect_int("A# = INSTR(\"HELLO\", \"LL\")", 2);
|
||||||
expect_int("A# = INSTR(\"HELLO\", \"ZZ\")", -1);
|
expect_int("A# = INSTR(\"HELLO\", \"ZZ\")", -1);
|
||||||
|
|
||||||
/* RND auto-seeds from host time and follows the documented LCG. */
|
|
||||||
HARNESS_RUNTIME.rndseeded = false;
|
|
||||||
TEST_REQUIRE_OK(akbasic_runtime_settime(&HARNESS_RUNTIME, 12345));
|
|
||||||
expect_int("A# = RND(6)", 0);
|
|
||||||
expect_int("A# = RND(6)", 4);
|
|
||||||
expect_int("A# = RND(6)", 1);
|
|
||||||
expect_int("A# = RND(6)", 0);
|
|
||||||
expect_int("A# = RND(6)", 1);
|
|
||||||
expect_int("A# = RND(1)", 0);
|
|
||||||
TEST_REQUIRE_STATUS(eval_line("A# = RND(0)", &out), AKBASIC_ERR_VALUE);
|
|
||||||
TEST_REQUIRE_STATUS(eval_line("A# = RND(-1)", &out), AKBASIC_ERR_VALUE);
|
|
||||||
TEST_REQUIRE_STATUS(eval_line("A# = RND(\"x\")", &out), AKBASIC_ERR_TYPE);
|
|
||||||
|
|
||||||
/* ASC is the inverse of CHR for ASCII and non-ASCII code points. */
|
|
||||||
expect_int("A# = ASC(CHR(97))", 97);
|
|
||||||
expect_int("A# = ASC(\"A\")", 65);
|
|
||||||
expect_int("A# = ASC(CHR(8364))", 8364);
|
|
||||||
TEST_REQUIRE_STATUS(eval_line("A# = ASC(\"\")", &out), AKBASIC_ERR_BOUNDS);
|
|
||||||
TEST_REQUIRE_STATUS(eval_line("A# = ASC(65)", &out), AKBASIC_ERR_TYPE);
|
|
||||||
|
|
||||||
/* An unknown verb is diagnosed rather than silently ignored. */
|
/* An unknown verb is diagnosed rather than silently ignored. */
|
||||||
TEST_REQUIRE_OK(akbasic_environment_zero(HARNESS_RUNTIME.environment));
|
TEST_REQUIRE_OK(akbasic_environment_zero(HARNESS_RUNTIME.environment));
|
||||||
TEST_REQUIRE_STATUS(akbasic_runtime_evaluate(&HARNESS_RUNTIME, NULL, &out),
|
TEST_REQUIRE_STATUS(akbasic_runtime_evaluate(&HARNESS_RUNTIME, NULL, &out),
|
||||||
|
|||||||
Reference in New Issue
Block a user