--- parser3/src/main/compile_tools.C 2001/09/26 10:32:26 1.38 +++ parser3/src/main/compile_tools.C 2002/01/31 16:39:01 1.42 @@ -2,9 +2,9 @@ Parser: compiler support helper functions. Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) - Author: Alexander Petrosyan (http://design.ru/paf) + Author: Alexander Petrosyan (http://paf.design.ru) - $Id: compile_tools.C,v 1.38 2001/09/26 10:32:26 parser Exp $ + $Id: compile_tools.C,v 1.42 2002/01/31 16:39:01 paf Exp $ */ #include "compile_tools.h" @@ -50,6 +50,16 @@ void CCA(Array/**/ *result, A *result+=code_array; } +void PNC(Array/**/ *result, Array/**/ *code_array) { + // append OP_CODE + Operation op; op.code=OP_NESTED_CODE; + *result+=op.cast; + + // append 'vstring' + *result+=code_array; +} + + Array *VL(Value *value) { // empty ops array Array *result=N(value->pool()); @@ -80,14 +90,27 @@ void change_string_literal_to_write_stri } void push_LS(parse_control& pc, lexical_state new_state) { - if(pc.spTHROW(0, 0, 0, "push_LS: stack overflow"); + throw Exception(0, 0, 0, "push_LS: ls_stack overflow"); } void pop_LS(parse_control& pc) { - if(--pc.sp>=0) - pc.ls=pc.stack[pc.sp]; + if(--pc.ls_sp>=0) + pc.ls=pc.ls_stack[pc.ls_sp]; else - pc.pool->THROW(0, 0, 0, "pop_LS: stack underflow"); + throw Exception(0, 0, 0, "pop_LS: ls_stack underflow"); +} + +void push_OCA(parse_control& pc, bool operator_call_allowed) { + if(pc.oca_sp