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

enhanced line end handling

Browse Source
This commit is contained in:
hyunghwan.chung 2016-09-06 16:06:22 +00:00
parent d704ce5975
commit 155babff74
5 changed files with 53 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
stix/kernel/Stix.st
View File

@ -2,7 +2,6 @@
#include 'Class.st'. #include 'Class.st'.
#include 'Boolean.st'. #include 'Boolean.st'.
######################################################################################### #########################################################################################
#class Error(Object) #class Error(Object)

72
stix/lib/comp.c
View File

@ -281,8 +281,8 @@ static int is_reserved_word (const stix_oocs_t* ucs)
return 0; return 0;
} }
static int begin_include (stix_t* fsc); static int begin_include (stix_t* stix);
static int end_include (stix_t* fsc); static int end_include (stix_t* stix);
static void set_syntax_error (stix_t* stix, stix_synerrnum_t num, const stix_ioloc_t* loc, const stix_oocs_t* tgt) static void set_syntax_error (stix_t* stix, stix_synerrnum_t num, const stix_ioloc_t* loc, const stix_oocs_t* tgt)
{ {
@ -395,7 +395,7 @@ static int find_word_in_string (const stix_oocs_t* haystack, const stix_oocs_t*
(c >= 'A' && c <= 'Z')? ((c - 'A' + 10 < base)? (c - 'A' + 10): base): \ (c >= 'A' && c <= 'Z')? ((c - 'A' + 10 < base)? (c - 'A' + 10): base): \
(c >= 'a' && c <= 'z')? ((c - 'a' + 10 < base)? (c - 'a' + 10): base): base) (c >= 'a' && c <= 'z')? ((c - 'a' + 10 < base)? (c - 'a' + 10): base): base)
static int string_to_smint (stix_t* stix, stix_oocs_t* str, int radixed, stix_ooi_t* num) static int string_to_smooi (stix_t* stix, stix_oocs_t* str, int radixed, stix_ooi_t* num)
{ {
/* it is not a generic conversion function. /* it is not a generic conversion function.
* it assumes a certain pre-sanity check on the string * it assumes a certain pre-sanity check on the string
@ -641,15 +641,31 @@ static int get_char (stix_t* stix)
stix->c->curinp->b.len = n; stix->c->curinp->b.len = n;
} }
if (stix->c->curinp->lxc.c == STIX_UCI_NL) if (stix->c->curinp->lxc.c == '\n' || stix->c->curinp->lxc.c == '\r')
{ {
/* if the previous charater was a newline, /* stix->c->curinp->lxc.c is a previous character. the new character
* increment the line counter and reset column to 1. * to be read is still in the buffer (stix->c->curinp->buf).
* incrementing the line number here instead of * stix->cu->curinp->colm has been incremented when the previous
* updating inp->lxc causes the line number for * character has been read. */
* TOK_EOF to be the same line as the lxc newline. */ if (stix->c->curinp->line > 1 &&
stix->c->curinp->line++; stix->c->curinp->colm == 2 &&
stix->c->curinp->colm = 1; stix->c->curinp->nl != stix->c->curinp->lxc.c)
{
/* most likely, it's the second character in '\r\n' or '\n\r'
* sequence. let's not update the line and column number. */
/*stix->c->curinp->colm = 1;*/
}
else
{
/* if the previous charater was a newline,
* increment the line counter and reset column to 1.
* incrementing the line number here instead of
* updating inp->lxc causes the line number for
* TOK_EOF to be the same line as the lxc newline. */
stix->c->curinp->line++;
stix->c->curinp->colm = 1;
stix->c->curinp->nl = stix->c->curinp->lxc.c;
}
} }
lc = stix->c->curinp->buf[stix->c->curinp->b.pos++]; lc = stix->c->curinp->buf[stix->c->curinp->b.pos++];
@ -744,7 +760,7 @@ static int skip_comment (stix_t* stix)
{ {
break; break;
} }
else if (c == STIX_UCI_NL) else if (c == '\r' || c == '\n')
{ {
GET_CHAR (stix); GET_CHAR (stix);
break; break;
@ -1320,14 +1336,14 @@ retry:
case '(': case '(':
/* #( */ /* #( */
ADD_TOKEN_CHAR(stix, c); ADD_TOKEN_CHAR(stix, c);
SET_TOKEN_TYPE (stix, STIX_IOTOK_APAREN); SET_TOKEN_TYPE (stix, STIX_IOTOK_ARPAREN);
GET_CHAR (stix); GET_CHAR (stix);
break; break;
case '[': case '[':
/* #[ - byte array literal */ /* #[ - byte array literal */
ADD_TOKEN_CHAR(stix, c); ADD_TOKEN_CHAR(stix, c);
SET_TOKEN_TYPE (stix, STIX_IOTOK_BPAREN); SET_TOKEN_TYPE (stix, STIX_IOTOK_BAPAREN);
GET_CHAR (stix); GET_CHAR (stix);
break; break;
@ -1562,6 +1578,7 @@ static int begin_include (stix_t* stix)
arg->name = io_name; arg->name = io_name;
arg->line = 1; arg->line = 1;
arg->colm = 1; arg->colm = 1;
/*arg->nl = '\0';*/
arg->includer = stix->c->curinp; arg->includer = stix->c->curinp;
if (stix->c->impl (stix, STIX_IO_OPEN, arg) <= -1) if (stix->c->impl (stix, STIX_IO_OPEN, arg) <= -1)
@ -2553,7 +2570,7 @@ static int compile_method_name (stix_t* stix)
STIX_ASSERT (stix->c->mth.tmpr_count == 0); STIX_ASSERT (stix->c->mth.tmpr_count == 0);
stix->c->mth.name_loc = stix->c->tok.loc; stix->c->mth.name_loc = stix->c->tok.loc;
switch (stix->c->tok.type) switch (TOKEN_TYPE(stix))
{ {
case STIX_IOTOK_IDENT: case STIX_IOTOK_IDENT:
n = compile_unary_method_name(stix); n = compile_unary_method_name(stix);
@ -2654,7 +2671,7 @@ static int compile_method_primitive (stix_t* stix)
if (is_token_keyword(stix, VOCA_PRIMITIVE_COLON)) if (is_token_keyword(stix, VOCA_PRIMITIVE_COLON))
{ {
GET_TOKEN (stix); GET_TOKEN (stix);
switch (stix->c->tok.type) switch (TOKEN_TYPE(stix))
{ {
case STIX_IOTOK_NUMLIT: /* TODO: allow only an integer */ case STIX_IOTOK_NUMLIT: /* TODO: allow only an integer */
/*TODO: more checks the validity of the primitive number. support number with radix and so on support more extensive syntax. support primitive name, not number*/ /*TODO: more checks the validity of the primitive number. support number with radix and so on support more extensive syntax. support primitive name, not number*/
@ -3215,7 +3232,7 @@ static int __read_byte_array_literal (stix_t* stix, stix_oop_t* xlit)
{ {
/* TODO: check if the number is an integer */ /* TODO: check if the number is an integer */
if (string_to_smint(stix, TOKEN_NAME(stix), TOKEN_TYPE(stix) == STIX_IOTOK_RADNUMLIT, &tmp) <= -1) if (string_to_smooi(stix, TOKEN_NAME(stix), TOKEN_TYPE(stix) == STIX_IOTOK_RADNUMLIT, &tmp) <= -1)
{ {
/* the token reader reads a valid token. no other errors /* the token reader reads a valid token. no other errors
* than the range error must not occur */ * than the range error must not occur */
@ -3268,14 +3285,13 @@ static int __read_array_literal (stix_t* stix, stix_oop_t* xlit)
do do
{ {
switch (stix->c->tok.type) switch (TOKEN_TYPE(stix))
{ {
/* TODO: floating pointer number */ /* TODO: floating pointer number */
case STIX_IOTOK_NUMLIT: case STIX_IOTOK_NUMLIT:
case STIX_IOTOK_RADNUMLIT: case STIX_IOTOK_RADNUMLIT:
lit = string_to_num (stix, TOKEN_NAME(stix), TOKEN_TYPE(stix) == STIX_IOTOK_RADNUMLIT); lit = string_to_num (stix, TOKEN_NAME(stix), TOKEN_TYPE(stix) == STIX_IOTOK_RADNUMLIT);
if (!lit) return -1;
break; break;
case STIX_IOTOK_CHARLIT: case STIX_IOTOK_CHARLIT:
@ -3311,7 +3327,7 @@ static int __read_array_literal (stix_t* stix, stix_oop_t* xlit)
lit = stix->_false; lit = stix->_false;
break; break;
case STIX_IOTOK_APAREN: /* #( */ case STIX_IOTOK_ARPAREN: /* #( */
case STIX_IOTOK_LPAREN: /* ( */ case STIX_IOTOK_LPAREN: /* ( */
saved_arlit_count = stix->c->mth.arlit_count; saved_arlit_count = stix->c->mth.arlit_count;
/* TODO: get rid of recursion?? */ /* TODO: get rid of recursion?? */
@ -3320,7 +3336,7 @@ static int __read_array_literal (stix_t* stix, stix_oop_t* xlit)
stix->c->mth.arlit_count = saved_arlit_count; stix->c->mth.arlit_count = saved_arlit_count;
break; break;
case STIX_IOTOK_BPAREN: /* #[ */ case STIX_IOTOK_BAPAREN: /* #[ */
case STIX_IOTOK_LBRACK: /* [ */ case STIX_IOTOK_LBRACK: /* [ */
GET_TOKEN (stix); GET_TOKEN (stix);
if (__read_byte_array_literal (stix, &lit) <= -1) return -1; if (__read_byte_array_literal (stix, &lit) <= -1) return -1;
@ -3490,7 +3506,7 @@ static int compile_expression_primary (stix_t* stix, const stix_oocs_t* ident, c
} }
else else
{ {
switch (stix->c->tok.type) switch (TOKEN_TYPE(stix))
{ {
case STIX_IOTOK_IDENT_DOTTED: case STIX_IOTOK_IDENT_DOTTED:
ident_dotted = 1; ident_dotted = 1;
@ -3579,12 +3595,12 @@ static int compile_expression_primary (stix_t* stix, const stix_oocs_t* ident, c
break; break;
} }
case STIX_IOTOK_BPAREN: /* #[ */ case STIX_IOTOK_BAPAREN: /* #[ */
/*GET_TOKEN (stix);*/ /*GET_TOKEN (stix);*/
if (compile_byte_array_literal(stix) <= -1) return -1; if (compile_byte_array_literal(stix) <= -1) return -1;
break; break;
case STIX_IOTOK_APAREN: /* #( */ case STIX_IOTOK_ARPAREN: /* #( */
/*GET_TOKEN (stix);*/ /*GET_TOKEN (stix);*/
if (compile_array_literal(stix) <= -1) return -1; if (compile_array_literal(stix) <= -1) return -1;
break; break;
@ -3776,7 +3792,7 @@ static int compile_message_expression (stix_t* stix, int to_super)
do do
{ {
switch (stix->c->tok.type) switch (TOKEN_TYPE(stix))
{ {
case STIX_IOTOK_IDENT: case STIX_IOTOK_IDENT:
/* insert NOOP to change to DUP_STACKTOP if there is a /* insert NOOP to change to DUP_STACKTOP if there is a
@ -4961,7 +4977,7 @@ static int __compile_pooldic_definition (stix_t* stix)
GET_TOKEN (stix); GET_TOKEN (stix);
switch (stix->c->tok.type) switch (TOKEN_TYPE(stix))
{ {
case STIX_IOTOK_NIL: case STIX_IOTOK_NIL:
lit = stix->_nil; lit = stix->_nil;
@ -4996,11 +5012,11 @@ static int __compile_pooldic_definition (stix_t* stix)
if (!lit) return -1; if (!lit) return -1;
goto add_literal; goto add_literal;
case STIX_IOTOK_BPAREN: /* #[ */ case STIX_IOTOK_BAPAREN: /* #[ - byte array parenthesis */
if (read_byte_array_literal(stix, &lit) <= -1) return -1; if (read_byte_array_literal(stix, &lit) <= -1) return -1;
goto add_literal; goto add_literal;
case STIX_IOTOK_APAREN: /* #( */ case STIX_IOTOK_ARPAREN: /* #( - array parenthesis */
if (read_array_literal(stix, &lit) <= -1) return -1; if (read_array_literal(stix, &lit) <= -1) return -1;
goto add_literal; goto add_literal;

1
stix/lib/main.c
View File

@ -197,6 +197,7 @@ static STIX_INLINE stix_ooi_t close_input (stix_t* stix, stix_ioarg_t* arg)
fclose (bb->fp); fclose (bb->fp);
stix_freemem (stix, bb); stix_freemem (stix, bb);
arg->handle = STIX_NULL;
return 0; return 0;
} }

2
stix/lib/stix-cmn.h
View File

@ -1,7 +1,7 @@
/* /*
* $Id$ * $Id$
* *
Copyright (c) s2014-2016 Chung, Hyung-Hwan. All rights reserved. Copyright (c) 2014-2016 Chung, Hyung-Hwan. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions modification, are permitted provided that the following conditions

13
stix/lib/stix-prv.h
View File

@ -244,8 +244,8 @@ typedef enum stix_iocmd_t stix_iocmd_t;
struct stix_ioloc_t struct stix_ioloc_t
{ {
unsigned long line; /**< line */ unsigned long int line; /**< line */
unsigned long colm; /**< column */ unsigned long int colm; /**< column */
const stix_ooch_t* file; /**< file specified in #include */ const stix_ooch_t* file; /**< file specified in #include */
}; };
typedef struct stix_ioloc_t stix_ioloc_t; typedef struct stix_ioloc_t stix_ioloc_t;
@ -301,8 +301,9 @@ struct stix_ioarg_t
int pos, len, state; int pos, len, state;
} b; } b;
unsigned long line; unsigned long int line;
unsigned long colm; unsigned long int colm;
stix_ooci_t nl;
stix_iolxc_t lxc; stix_iolxc_t lxc;
/*-----------------------------------------------------------------*/ /*-----------------------------------------------------------------*/
@ -344,8 +345,8 @@ struct stix_iotok_t
STIX_IOTOK_RBRACK, STIX_IOTOK_RBRACK,
STIX_IOTOK_LPAREN, STIX_IOTOK_LPAREN,
STIX_IOTOK_RPAREN, STIX_IOTOK_RPAREN,
STIX_IOTOK_APAREN, /* #( */ STIX_IOTOK_ARPAREN, /* #( */
STIX_IOTOK_BPAREN, /* #[ */ STIX_IOTOK_BAPAREN, /* #[ */
STIX_IOTOK_PERIOD, STIX_IOTOK_PERIOD,
STIX_IOTOK_SEMICOLON STIX_IOTOK_SEMICOLON
} type; } type;