diff options
-rw-r--r-- | src/bytecode.c | 40 | ||||
-rw-r--r-- | src/bytecode.h | 18 | ||||
-rw-r--r-- | src/lmparse.kh | 2 | ||||
-rw-r--r-- | src/lmparse.kl | 2 | ||||
-rw-r--r-- | src/lmscan.rl | 4 | ||||
-rw-r--r-- | src/synthesis.cc | 12 |
6 files changed, 39 insertions, 39 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index 0b9f8e9d..10b40cef 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -597,10 +597,10 @@ again: debug( REALM_BYTECODE, "IN_LOAD_CONTEXT_BKT\n" ); break; } - case IN_LOAD_ACCUM_BKT: { + case IN_LOAD_PARSER_BKT: { /* Tree *parser; */ consume_word(); - debug( REALM_BYTECODE, "IN_LOAD_ACCUM_BKT\n" ); + debug( REALM_BYTECODE, "IN_LOAD_PARSER_BKT\n" ); break; } case IN_LOAD_INPUT_BKT: { @@ -1005,29 +1005,29 @@ again: vm_push( prg->global ); break; } - case IN_LOAD_ACCUM_R: { - debug( REALM_BYTECODE, "IN_LOAD_ACCUM_R\n" ); + case IN_LOAD_PARSER_R: { + debug( REALM_BYTECODE, "IN_LOAD_PARSER_R\n" ); treeUpref( (Tree*)exec->parser ); vm_push( (Tree*)exec->parser ); assert( exec->parser != 0 ); break; } - case IN_LOAD_ACCUM_WV: { - debug( REALM_BYTECODE, "IN_LOAD_ACCUM_WV\n" ); + case IN_LOAD_PARSER_WV: { + debug( REALM_BYTECODE, "IN_LOAD_PARSER_WV\n" ); treeUpref( (Tree*)exec->parser ); vm_push( (Tree*)exec->parser ); assert( exec->parser != 0 ); /* Set up the reverse instruction. */ - append( &exec->pdaRun->rcodeCollect, IN_LOAD_ACCUM_BKT ); + append( &exec->pdaRun->rcodeCollect, IN_LOAD_PARSER_BKT ); appendWord( &exec->pdaRun->rcodeCollect, (Word)exec->parser ); exec->rcodeUnitLen = SIZEOF_CODE + SIZEOF_WORD; break; } - case IN_LOAD_ACCUM_WC: { - debug( REALM_BYTECODE, "IN_LOAD_ACCUM_WC\n" ); + case IN_LOAD_PARSER_WC: { + debug( REALM_BYTECODE, "IN_LOAD_PARSER_WC\n" ); /* This is identical to the _R version, but using it for writing * would be confusing. */ @@ -1036,11 +1036,11 @@ again: assert( exec->parser != 0 ); break; } - case IN_LOAD_ACCUM_BKT: { + case IN_LOAD_PARSER_BKT: { Tree *parser; read_tree( parser ); - debug( REALM_BYTECODE, "IN_LOAD_ACCUM_BKT\n" ); + debug( REALM_BYTECODE, "IN_LOAD_PARSER_BKT\n" ); treeUpref( parser ); vm_push( parser ); @@ -1101,7 +1101,7 @@ again: vm_push( exec->pdaRun->context ); /* Set up the reverse instruction. */ - append( &exec->pdaRun->rcodeCollect, IN_LOAD_ACCUM_BKT ); + append( &exec->pdaRun->rcodeCollect, IN_LOAD_PARSER_BKT ); appendWord( &exec->pdaRun->rcodeCollect, (Word)exec->parser ); exec->rcodeUnitLen = SIZEOF_CODE + SIZEOF_WORD; break; @@ -2067,8 +2067,8 @@ again: break; } - case IN_GET_ACCUM_CTX_R: { - debug( REALM_BYTECODE, "IN_GET_ACCUM_CTX_R\n" ); + case IN_GET_PARSER_CTX_R: { + debug( REALM_BYTECODE, "IN_GET_PARSER_CTX_R\n" ); Tree *obj = vm_pop(); Tree *ctx = ((Parser*)obj)->pdaRun->context; @@ -2078,8 +2078,8 @@ again: break; } - case IN_SET_ACCUM_CTX_WC: { - debug( REALM_BYTECODE, "IN_SET_ACCUM_CTX_WC\n" ); + case IN_SET_PARSER_CTX_WC: { + debug( REALM_BYTECODE, "IN_SET_PARSER_CTX_WC\n" ); Tree *parser = vm_pop(); Tree *val = vm_pop(); @@ -2088,10 +2088,10 @@ again: break; } -// case IN_GET_ACCUM_CTX_WC: -// case IN_GET_ACCUM_CTX_WV: -// case IN_SET_ACCUM_CTX_WC: -// case IN_SET_ACCUM_CTX_WV: +// case IN_GET_PARSER_CTX_WC: +// case IN_GET_PARSER_CTX_WV: +// case IN_SET_PARSER_CTX_WC: +// case IN_SET_PARSER_CTX_WV: // break; case IN_INPUT_APPEND_WC: { diff --git a/src/bytecode.h b/src/bytecode.h index c87f0d7c..2d3afd64 100644 --- a/src/bytecode.h +++ b/src/bytecode.h @@ -263,10 +263,10 @@ typedef unsigned char uchar; #define IN_EXIT 0xbb #define IN_ERROR 0xbc -#define IN_LOAD_ACCUM_R 0xbd -#define IN_LOAD_ACCUM_WV 0xbe -#define IN_LOAD_ACCUM_WC 0xbf -#define IN_LOAD_ACCUM_BKT 0xc0 +#define IN_LOAD_PARSER_R 0xbd +#define IN_LOAD_PARSER_WV 0xbe +#define IN_LOAD_PARSER_WC 0xbf +#define IN_LOAD_PARSER_BKT 0xc0 #define IN_LOAD_INPUT_R 0xc1 #define IN_LOAD_INPUT_WV 0xc2 @@ -282,11 +282,11 @@ typedef unsigned char uchar; #define IN_LOAD_CONTEXT_WC 0xca #define IN_LOAD_CONTEXT_BKT 0xcb -#define IN_GET_ACCUM_CTX_R 0xcd -#define IN_GET_ACCUM_CTX_WC 0xce -#define IN_GET_ACCUM_CTX_WV 0xcf -#define IN_SET_ACCUM_CTX_WC 0xd0 -#define IN_SET_ACCUM_CTX_WV 0xd1 +#define IN_GET_PARSER_CTX_R 0xcd +#define IN_GET_PARSER_CTX_WC 0xce +#define IN_GET_PARSER_CTX_WV 0xcf +#define IN_SET_PARSER_CTX_WC 0xd0 +#define IN_SET_PARSER_CTX_WV 0xd1 #define IN_LOAD_CTX_R 0xd2 #define IN_LOAD_CTX_WC 0xd3 diff --git a/src/lmparse.kh b/src/lmparse.kh index 86b70b6f..e55f3c25 100644 --- a/src/lmparse.kh +++ b/src/lmparse.kh @@ -53,7 +53,7 @@ struct ColmParser # Defining things. token KW_Rl, KW_Def, KW_Lex, KW_Context, KW_Ignore, KW_Token, KW_Commit, KW_Namespace, - KW_Literal, KW_ReduceFirst, KW_Map, KW_List, KW_Vector, KW_Accum, KW_Global, KW_Export, + KW_Literal, KW_ReduceFirst, KW_Map, KW_List, KW_Vector, KW_Parser, KW_Global, KW_Export, KW_Iter, KW_Reject, KW_Ptr, KW_Ref, KW_Deref; # Language. diff --git a/src/lmparse.kl b/src/lmparse.kl index 50d09221..e94a1ac8 100644 --- a/src/lmparse.kl +++ b/src/lmparse.kl @@ -430,7 +430,7 @@ type_ref: KW_Vector '<' type_ref '>' $$->typeRef = TypeRef::cons( InputLoc(), TypeRef::Vector, nspaceQual, $3->typeRef, 0 ); }; -type_ref: KW_Accum '<' type_ref '>' +type_ref: KW_Parser '<' type_ref '>' final { NamespaceQual *nspaceQual = new NamespaceQual( namespaceStack.top(), regionStack.top() ); diff --git a/src/lmscan.rl b/src/lmscan.rl index 583c62e6..d38df495 100644 --- a/src/lmscan.rl +++ b/src/lmscan.rl @@ -447,8 +447,8 @@ void ColmScanner::endSection( ) 'map' => { token( KW_Map ); }; 'list' => { token( KW_List ); }; 'vector' => { token( KW_Vector ); }; - 'accum' => { token( KW_Accum ); }; - 'parser' => { token( KW_Accum ); }; + 'accum' => { token( KW_Parser ); }; + 'parser' => { token( KW_Parser ); }; 'return' => { token( KW_Return ); }; 'break' => { token( KW_Break ); }; 'yield' => { token( KW_Yield ); }; diff --git a/src/synthesis.cc b/src/synthesis.cc index 291f07cf..ef91d2f3 100644 --- a/src/synthesis.cc +++ b/src/synthesis.cc @@ -1551,7 +1551,7 @@ UniqueType *LangTerm::evaluateParse( Compiler *pd, CodeVect &code, bool stop ) c /* FIXME: need to select right one here. */ code.append( IN_DUP_TOP_OFF ); code.appendHalf( 1 ); - code.append( IN_SET_ACCUM_CTX_WC ); + code.append( IN_SET_PARSER_CTX_WC ); /* * Evaluate the parse arg. @@ -2975,11 +2975,11 @@ void Compiler::initCtxField( GenericType *gen ) TypeRef *typeRef = TypeRef::cons( InputLoc(), ctxUT ); ObjField *el = new ObjField( InputLoc(), typeRef, "ctx" ); - el->inGetR = IN_GET_ACCUM_CTX_R; - el->inGetWC = IN_GET_ACCUM_CTX_WC; - el->inGetWV = IN_GET_ACCUM_CTX_WV; - el->inSetWC = IN_SET_ACCUM_CTX_WC; - el->inSetWV = IN_SET_ACCUM_CTX_WV; + el->inGetR = IN_GET_PARSER_CTX_R; + el->inGetWC = IN_GET_PARSER_CTX_WC; + el->inGetWV = IN_GET_PARSER_CTX_WV; + el->inSetWC = IN_SET_PARSER_CTX_WC; + el->inSetWV = IN_SET_PARSER_CTX_WV; gen->objDef->insertField( el->name, el ); |