diff options
| -rw-r--r-- | src/bytecode.c | 418 | ||||
| -rw-r--r-- | src/ctinput.cc | 2 | ||||
| -rw-r--r-- | src/input.c | 6 | ||||
| -rw-r--r-- | src/iter.c | 8 | ||||
| -rw-r--r-- | src/list.c | 4 | ||||
| -rw-r--r-- | src/map.c | 4 | ||||
| -rw-r--r-- | src/map.h | 2 | ||||
| -rw-r--r-- | src/pdarun.c | 132 | ||||
| -rw-r--r-- | src/pool.c | 158 | ||||
| -rw-r--r-- | src/pool.h | 60 | ||||
| -rw-r--r-- | src/program.c | 34 | ||||
| -rw-r--r-- | src/string.c | 10 | ||||
| -rw-r--r-- | src/struct.c | 6 | ||||
| -rw-r--r-- | src/tree.c | 170 | ||||
| -rw-r--r-- | src/tree.h | 22 | ||||
| -rw-r--r-- | test/ext1.lm | 4 |
16 files changed, 479 insertions, 561 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index aacdb7fd..d3d7782b 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -158,11 +158,11 @@ static word_t stream_append_tree( program_t *prg, tree_t **sp, stream_t *dest, t strCollectDestroy( &collect ); } else if ( input->id == LEL_ID_PTR ) { - treeUpref( input ); + colm_tree_upref( input ); impl->funcs->appendStream( impl, input ); } else { - treeUpref( input ); + colm_tree_upref( input ); impl->funcs->appendTree( impl, input ); } @@ -188,7 +188,7 @@ static void stream_undo_append( program_t *prg, tree_t **sp, is->funcs->undoAppendStream( is ); else { tree_t *tree = is->funcs->undoAppendTree( is ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); } } @@ -234,12 +234,12 @@ static long stream_push( program_t *prg, tree_t **sp, struct stream_impl *in, tr return length; } else if ( tree->id == LEL_ID_PTR ) { - treeUpref( tree ); + colm_tree_upref( tree ); colm_stream_push_stream( in, tree ); return -1; } else { - treeUpref( tree ); + colm_tree_upref( tree ); colm_stream_push_tree( in, tree, ignore ); return -1; } @@ -277,7 +277,7 @@ static void downref_local_trees( program_t *prg, tree_t **sp, (long)locals[i].offset ); tree_t *tree = (tree_t*) vm_get_local( exec, (long)locals[i].offset ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); } } } @@ -292,7 +292,7 @@ static void downref_locals( program_t *prg, tree_t ***psp, debug( prg, REALM_BYTECODE, "local tree downref: %ld\n", (long)locals[i].offset ); tree_t *tree = (tree_t*) vm_get_local( exec, (long)locals[i].offset ); - treeDownref( prg, *psp, tree ); + colm_tree_downref( prg, *psp, tree ); break; } case LI_Iter: { @@ -327,7 +327,7 @@ static tree_t *construct_arg0( program_t *prg, int argc, const char **argv ) if ( argc > 0 ) { head_t *head = colm_string_alloc_pointer( prg, argv[0], strlen(argv[0]) ); arg0 = constructString( prg, head ); - treeUpref( arg0 ); + colm_tree_upref( arg0 ); } return arg0; } @@ -339,7 +339,7 @@ static list_t *construct_argv( program_t *prg, int argc, const char **argv ) for ( i = 1; i < argc; i++ ) { head_t *head = colm_string_alloc_pointer( prg, argv[i], strlen(argv[i]) ); tree_t *arg = constructString( prg, head ); - treeUpref( arg ); + colm_tree_upref( arg ); struct_t *strct = colm_struct_new_size( prg, 16 ); strct->id = prg->rtd->argvElId; @@ -405,7 +405,7 @@ void colm_execute( program_t *prg, Execution *exec, code_t *code ) vm_pop_ignore(); vm_pop_ignore(); - treeDownref( prg, sp, prg->returnVal ); + colm_tree_downref( prg, sp, prg->returnVal ); prg->returnVal = vm_pop_tree(); vm_pop_ignore(); @@ -439,7 +439,7 @@ tree_t *colm_run_func( struct colm_program *prg, int frameId, else { head_t *head = colm_string_alloc_pointer( prg, params[p], strlen(params[p]) ); tree_t *tree = constructString( prg, head ); - treeUpref( tree ); + colm_tree_upref( tree ); ((tree_t**)execution.callArgs)[p] = tree; } } @@ -463,7 +463,7 @@ tree_t *colm_run_func( struct colm_program *prg, int frameId, /* Execution loop. */ sp = colm_execute_code( prg, &execution, sp, code ); - treeDownref( prg, sp, prg->returnVal ); + colm_tree_downref( prg, sp, prg->returnVal ); prg->returnVal = execution.retVal; vm_popn( paramCount ); @@ -591,7 +591,7 @@ again: read_tree( restore ); debug( prg, REALM_BYTECODE, "IN_RESTORE_LHS\n" ); - treeDownref( prg, sp, exec->parser->pdaRun->parseInput->shadow->tree ); + colm_tree_downref( prg, sp, exec->parser->pdaRun->parseInput->shadow->tree ); exec->parser->pdaRun->parseInput->shadow->tree = restore; break; } @@ -617,13 +617,13 @@ again: } case IN_LOAD_TRUE: { debug( prg, REALM_BYTECODE, "IN_LOAD_TRUE\n" ); - //treeUpref( prg->trueVal ); + //colm_tree_upref( prg->trueVal ); vm_push_tree( prg->trueVal ); break; } case IN_LOAD_FALSE: { debug( prg, REALM_BYTECODE, "IN_LOAD_FALSE\n" ); - //treeUpref( prg->falseVal ); + //colm_tree_upref( prg->falseVal ); vm_push_tree( prg->falseVal ); break; } @@ -645,7 +645,7 @@ again: head_t *lit = makeLiteral( prg, offset ); tree_t *tree = constructString( prg, lit ); - treeUpref( tree ); + colm_tree_upref( tree ); vm_push_tree( tree ); break; } @@ -662,7 +662,7 @@ again: printTreeFile( prg, sp, stdout, arg[i], false ); for ( i = 0; i < n; i++ ) - treeDownref( prg, sp, arg[i] ); + colm_tree_downref( prg, sp, arg[i] ); break; } case IN_PRINT_STREAM: { @@ -684,7 +684,7 @@ again: } for ( i = 0; i < n; i++ ) - treeDownref( prg, sp, arg[i] ); + colm_tree_downref( prg, sp, arg[i] ); break; } case IN_PRINT_XML_AC: { @@ -701,7 +701,7 @@ again: printXmlStdout( prg, sp, arg[i], true, true ); for ( i = 0; i < n; i++ ) - treeDownref( prg, sp, arg[i] ); + colm_tree_downref( prg, sp, arg[i] ); break; } case IN_PRINT_XML: { @@ -717,7 +717,7 @@ again: printXmlStdout( prg, sp, arg[i], false, true ); for ( i = 0; i < n; i++ ) - treeDownref( prg, sp, arg[i] ); + colm_tree_downref( prg, sp, arg[i] ); break; } @@ -787,7 +787,7 @@ again: debug( prg, REALM_BYTECODE, "IN_LOAD_INPUT_BKT\n" ); - treeUpref( accumStream ); + colm_tree_upref( accumStream ); vm_push_tree( accumStream ); break; } @@ -852,7 +852,7 @@ again: head_t *data = stringAllocFull( prg, mark[ca->mark_enter], mark[ca->mark_leave] - mark[ca->mark_enter] ); tree_t *string = constructString( prg, data ); - treeUpref( string ); + colm_tree_upref( string ); set_local( exec, -1 - i, string ); } break; @@ -866,7 +866,7 @@ again: debug( prg, REALM_BYTECODE, "IN_INIT_RHS_EL %hd\n", field ); tree_t *val = getRhsEl( prg, exec->parser->pdaRun->redLel->shadow->tree, position ); - treeUpref( val ); + colm_tree_upref( val ); vm_set_local(exec, field, val); break; } @@ -881,7 +881,7 @@ again: tree_t *val = exec->parser->pdaRun->redLel->shadow->tree; /* Save it. */ - treeUpref( val ); + colm_tree_upref( val ); exec->parser->pdaRun->parsed = val; exec->parser->pdaRun->redLel->shadow->tree = 0; @@ -927,7 +927,7 @@ again: user_iter_t *uiter = (user_iter_t*) vm_get_local(exec, field); tree_t *val = uiter->ref.kid->tree; - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; } @@ -940,7 +940,7 @@ again: user_iter_t *uiter = (user_iter_t*) vm_get_local(exec, field); splitRef( prg, &sp, &uiter->ref ); tree_t *split = uiter->ref.kid->tree; - treeUpref( split ); + colm_tree_upref( split ); vm_push_tree( split ); break; } @@ -955,7 +955,7 @@ again: splitRef( prg, &sp, &uiter->ref ); tree_t *old = uiter->ref.kid->tree; setUiterCur( prg, uiter, t ); - treeDownref( prg, sp, old ); + colm_tree_downref( prg, sp, old ); break; } case IN_GET_LOCAL_R: { @@ -965,7 +965,7 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_LOCAL_R %hd\n", field ); tree_t *val = vm_get_local(exec, field); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; } @@ -976,7 +976,7 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_LOCAL_WC %hd\n", field ); tree_t *split = get_local_split( prg, exec, field ); - treeUpref( split ); + colm_tree_upref( split ); vm_push_tree( split ); break; } @@ -986,7 +986,7 @@ again: debug( prg, REALM_BYTECODE, "IN_SET_LOCAL_WC %hd\n", field ); tree_t *val = vm_pop_tree(); - treeDownref( prg, sp, vm_get_local(exec, field) ); + colm_tree_downref( prg, sp, vm_get_local(exec, field) ); set_local( exec, field, val ); break; } @@ -1024,7 +1024,7 @@ again: ref_t *ref = (ref_t*) vm_get_plocal(exec, field); tree_t *val = ref->kid->tree; - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; } @@ -1037,7 +1037,7 @@ again: ref_t *ref = (ref_t*) vm_get_plocal(exec, field); splitRef( prg, &sp, ref ); tree_t *val = ref->kid->tree; - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; } @@ -1060,10 +1060,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_FIELD_TREE_R %d\n", field ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *val = colm_tree_get_field( obj, field ); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; } @@ -1074,10 +1074,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_FIELD_TREE_WC %d\n", field ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *split = getFieldSplit( prg, obj, field ); - treeUpref( split ); + colm_tree_upref( split ); vm_push_tree( split ); break; } @@ -1088,10 +1088,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_FIELD_TREE_WV\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *split = getFieldSplit( prg, obj, field ); - treeUpref( split ); + colm_tree_upref( split ); vm_push_tree( split ); /* Set up the reverse instruction. */ @@ -1106,10 +1106,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_FIELD_TREE_BKT\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *split = getFieldSplit( prg, obj, field ); - treeUpref( split ); + colm_tree_upref( split ); vm_push_tree( split ); break; } @@ -1121,11 +1121,11 @@ again: tree_t *obj = vm_pop_tree(); tree_t *val = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); /* Downref the old value. */ tree_t *prev = colm_tree_get_field( obj, field ); - treeDownref( prg, sp, prev ); + colm_tree_downref( prg, sp, prev ); colm_tree_set_field( prg, obj, field, val ); break; @@ -1138,7 +1138,7 @@ again: tree_t *obj = vm_pop_tree(); tree_t *val = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); /* Save the old value, then set the field. */ tree_t *prev = colm_tree_get_field( obj, field ); @@ -1160,11 +1160,11 @@ again: debug( prg, REALM_BYTECODE, "IN_SET_FIELD_TREE_BKT\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); /* Downref the old value. */ tree_t *prev = colm_tree_get_field( obj, field ); - treeDownref( prg, sp, prev ); + colm_tree_downref( prg, sp, prev ); colm_tree_set_field( prg, obj, field, val ); break; @@ -1182,7 +1182,7 @@ again: /* Downref the old value. */ tree_t *prev = colm_tree_get_field( obj, field ); - treeDownref( prg, sp, prev ); + colm_tree_downref( prg, sp, prev ); /* Set the field. */ colm_tree_set_field( prg, obj, field, val ); @@ -1198,7 +1198,7 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_FIELD_VAL_R %d\n", field ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *pointer = colm_tree_get_field( obj, field ); value_t value = 0; @@ -1215,15 +1215,15 @@ again: tree_t *obj = vm_pop_tree(); value_t value = vm_pop_value(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); /* Downref the old value. */ tree_t *prev = colm_tree_get_field( obj, field ); - treeDownref( prg, sp, prev ); + colm_tree_downref( prg, sp, prev ); /* Make it into a pointer. */ tree_t *pointer = colm_construct_pointer( prg, value ); - treeUpref( pointer ); + colm_tree_upref( pointer ); colm_tree_set_field( prg, obj, field, pointer ); break; @@ -1245,7 +1245,7 @@ again: tree_t *obj = vm_pop_tree(); tree_t *val = colm_struct_get_field( obj, tree_t*, field ); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; } @@ -1257,7 +1257,7 @@ again: tree_t *obj = vm_pop_tree(); tree_t *val = colm_struct_get_field( obj, tree_t*, field ); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; @@ -1270,7 +1270,7 @@ again: tree_t *obj = vm_pop_tree(); tree_t *val = colm_struct_get_field( obj, tree_t*, field ); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); /* Set up the reverse instruction. */ @@ -1285,10 +1285,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_STRUCT_BKT\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *split = getFieldSplit( prg, obj, field ); - treeUpref( split ); + colm_tree_upref( split ); vm_push_tree( split ); break; } @@ -1303,7 +1303,7 @@ again: /* Downref the old value. */ tree_t *prev = colm_struct_get_field( obj, tree_t*, field ); - treeDownref( prg, sp, prev ); + colm_tree_downref( prg, sp, prev ); colm_struct_set_field( obj, tree_t*, field, val ); break; } @@ -1339,7 +1339,7 @@ again: /* Downref the old value. */ tree_t *prev = colm_struct_get_field( obj, tree_t*, field ); - treeDownref( prg, sp, prev ); + colm_tree_downref( prg, sp, prev ); colm_struct_set_field( obj, tree_t*, field, val ); break; @@ -1404,7 +1404,7 @@ again: uchar len; tree_t *obj = vm_pop_tree(), *val = 0; - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); read_byte( len ); for ( i = 0; i < len; i++ ) { @@ -1417,7 +1417,7 @@ again: } } - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; } @@ -1425,7 +1425,7 @@ again: debug( prg, REALM_BYTECODE, "IN_POP_TREE\n" ); tree_t *val = vm_pop_tree(); - treeDownref( prg, sp, val ); + colm_tree_downref( prg, sp, val ); break; } case IN_POP_VAL: { @@ -1451,9 +1451,9 @@ again: str_t *format = vm_pop_string(); head_t *res = stringSprintf( prg, format, (long)integer ); str_t *str = (str_t*)constructString( prg, res ); - treeUpref( (tree_t*)str ); + colm_tree_upref( (tree_t*)str ); vm_push_string( str ); - treeDownref( prg, sp, (tree_t*)format ); + colm_tree_downref( prg, sp, (tree_t*)format ); break; } case IN_INT_TO_STR: { @@ -1462,7 +1462,7 @@ again: value_t i = vm_pop_value(); head_t *res = intToStr( prg, (long)i ); tree_t *str = constructString( prg, res ); - treeUpref( str ); + colm_tree_upref( str ); vm_push_tree( str ); break; } @@ -1472,9 +1472,9 @@ again: tree_t *tree = vm_pop_tree(); head_t *res = tree_to_str( prg, sp, tree, false ); tree_t *str = constructString( prg, res ); - treeUpref( str ); + colm_tree_upref( str ); vm_push_tree( str ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } case IN_TREE_TO_STR_TRIM: { @@ -1483,9 +1483,9 @@ again: tree_t *tree = vm_pop_tree(); head_t *res = tree_to_str( prg, sp, tree, true ); tree_t *str = constructString( prg, res ); - treeUpref( str ); + colm_tree_upref( str ); vm_push_tree( str ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } case IN_TREE_TRIM: { @@ -1503,9 +1503,9 @@ again: str_t *s1 = vm_pop_string(); head_t *res = concatStr( s1->value, s2->value ); tree_t *str = constructString( prg, res ); - treeUpref( str ); - treeDownref( prg, sp, (tree_t*)s1 ); - treeDownref( prg, sp, (tree_t*)s2 ); + colm_tree_upref( str ); + colm_tree_downref( prg, sp, (tree_t*)s1 ); + colm_tree_downref( prg, sp, (tree_t*)s2 ); vm_push_tree( str ); break; } @@ -1517,7 +1517,7 @@ again: long len = stringLength( str->value ); value_t res = len; vm_push_value( res ); - treeDownref( prg, sp, (tree_t*)str ); + colm_tree_downref( prg, sp, (tree_t*)str ); break; } case IN_JMP_FALSE_TREE: { @@ -1529,7 +1529,7 @@ again: tree_t *tree = vm_pop_tree(); if ( testFalse( prg, tree ) ) instr += dist; - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } case IN_JMP_TRUE_TREE: { @@ -1541,7 +1541,7 @@ again: tree_t *tree = vm_pop_tree(); if ( !testFalse( prg, tree ) ) instr += dist; - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } case IN_JMP_FALSE_VAL: { @@ -1589,11 +1589,11 @@ again: tree_t *o2 = vm_pop_tree(); tree_t *o1 = vm_pop_tree(); - long r = cmpTree( prg, o1, o2 ); + long r = colm_cmp_tree( prg, o1, o2 ); value_t val = r == 0 ? TRUE_VAL : FALSE_VAL; vm_push_value( val ); - treeDownref( prg, sp, o1 ); - treeDownref( prg, sp, o2 ); + colm_tree_downref( prg, sp, o1 ); + colm_tree_downref( prg, sp, o2 ); break; } case IN_TST_EQL_VAL: { @@ -1610,11 +1610,11 @@ again: tree_t *o2 = vm_pop_tree(); tree_t *o1 = vm_pop_tree(); - long r = cmpTree( prg, o1, o2 ); + long r = colm_cmp_tree( prg, o1, o2 ); value_t val = r != 0 ? TRUE_VAL : FALSE_VAL; vm_push_value( val ); - treeDownref( prg, sp, o1 ); - treeDownref( prg, sp, o2 ); + colm_tree_downref( prg, sp, o1 ); + colm_tree_downref( prg, sp, o2 ); break; } case IN_TST_NOT_EQL_VAL: { @@ -1640,11 +1640,11 @@ again: tree_t *o2 = vm_pop_tree(); tree_t *o1 = vm_pop_tree(); - long r = cmpTree( prg, o1, o2 ); + long r = colm_cmp_tree( prg, o1, o2 ); value_t val = r < 0 ? TRUE_VAL : FALSE_VAL; vm_push_value( val ); - treeDownref( prg, sp, o1 ); - treeDownref( prg, sp, o2 ); + colm_tree_downref( prg, sp, o1 ); + colm_tree_downref( prg, sp, o2 ); break; } case IN_TST_LESS_EQL_VAL: { @@ -1661,11 +1661,11 @@ again: tree_t *o2 = vm_pop_tree(); tree_t *o1 = vm_pop_tree(); - long r = cmpTree( prg, o1, o2 ); + long r = colm_cmp_tree( prg, o1, o2 ); value_t val = r <= 0 ? TRUE_VAL : FALSE_VAL; vm_push_value( val ); - treeDownref( prg, sp, o1 ); - treeDownref( prg, sp, o2 ); + colm_tree_downref( prg, sp, o1 ); + colm_tree_downref( prg, sp, o2 ); break; } case IN_TST_GRTR_VAL: { @@ -1682,11 +1682,11 @@ again: tree_t *o2 = vm_pop_tree(); tree_t *o1 = vm_pop_tree(); - long r = cmpTree( prg, o1, o2 ); + long r = colm_cmp_tree( prg, o1, o2 ); value_t val = r > 0 ? TRUE_VAL : FALSE_VAL; vm_push_value( val ); - treeDownref( prg, sp, o1 ); - treeDownref( prg, sp, o2 ); + colm_tree_downref( prg, sp, o1 ); + colm_tree_downref( prg, sp, o2 ); break; } case IN_TST_GRTR_EQL_VAL: { @@ -1704,11 +1704,11 @@ again: tree_t *o2 = vm_pop_tree(); tree_t *o1 = vm_pop_tree(); - long r = cmpTree( prg, o1, o2 ); + long r = colm_cmp_tree( prg, o1, o2 ); value_t val = r >= 0 ? TRUE_VAL : FALSE_VAL; vm_push_value( val ); - treeDownref( prg, sp, o1 ); - treeDownref( prg, sp, o2 ); + colm_tree_downref( prg, sp, o1 ); + colm_tree_downref( prg, sp, o2 ); break; } case IN_TST_LOGICAL_AND: { @@ -1735,7 +1735,7 @@ again: tree_t *tree = vm_pop_tree(); long r = !testFalse( prg, tree ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); vm_push_value( r ); break; } @@ -1756,7 +1756,7 @@ again: long r = testFalse( prg, tree ); value_t val = r ? TRUE_VAL : FALSE_VAL; vm_push_value( val ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } @@ -1811,7 +1811,7 @@ again: debug( prg, REALM_BYTECODE, "IN_DUP_TREE\n" ); tree_t *val = vm_top(); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; } @@ -1899,9 +1899,9 @@ again: tree_t *tree = vm_pop_tree(); tree_t *res = treeSearch( prg, tree, id ); - treeUpref( res ); + colm_tree_upref( res ); vm_push_tree( res ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } case IN_TRITER_ADVANCE: { @@ -1912,7 +1912,7 @@ again: tree_iter_t *iter = (tree_iter_t*) vm_get_plocal(exec, field); tree_t *res = treeIterAdvance( prg, &sp, iter ); - //treeUpref( res ); + //colm_tree_upref( res ); vm_push_tree( res ); break; } @@ -1924,7 +1924,7 @@ again: tree_iter_t *iter = (tree_iter_t*) vm_get_plocal(exec, field); tree_t *res = treeIterNextChild( prg, &sp, iter ); - //treeUpref( res ); + //colm_tree_upref( res ); vm_push_tree( res ); break; } @@ -1936,7 +1936,7 @@ again: rev_tree_iter_t *iter = (rev_tree_iter_t*) vm_get_plocal(exec, field); tree_t *res = treeRevIterPrevChild( prg, &sp, iter ); - //treeUpref( res ); + //colm_tree_upref( res ); vm_push_tree( res ); break; } @@ -1948,7 +1948,7 @@ again: tree_iter_t *iter = (tree_iter_t*) vm_get_plocal(exec, field); tree_t *res = treeIterNextRepeat( prg, &sp, iter ); - //treeUpref( res ); + //colm_tree_upref( res ); vm_push_tree( res ); break; } @@ -1960,7 +1960,7 @@ again: tree_iter_t *iter = (tree_iter_t*) vm_get_plocal(exec, field); tree_t *res = treeIterPrevRepeat( prg, &sp, iter ); - //treeUpref( res ); + //colm_tree_upref( res ); vm_push_tree( res ); break; } @@ -1972,7 +1972,7 @@ again: tree_iter_t *iter = (tree_iter_t*) vm_get_plocal(exec, field); tree_t *tree = treeIterDerefCur( iter ); - treeUpref( tree ); + colm_tree_upref( tree ); vm_push_tree( tree ); break; } @@ -1985,7 +1985,7 @@ again: tree_iter_t *iter = (tree_iter_t*) vm_get_plocal(exec, field); splitIterCur( prg, &sp, iter ); tree_t *tree = treeIterDerefCur( iter ); - treeUpref( tree ); + colm_tree_upref( tree ); vm_push_tree( tree ); break; } @@ -2000,7 +2000,7 @@ again: splitIterCur( prg, &sp, iter ); tree_t *old = treeIterDerefCur( iter ); setTriterCur( prg, iter, tree ); - treeDownref( prg, sp, old ); + colm_tree_downref( prg, sp, old ); break; } case IN_GEN_ITER_FROM_REF: { @@ -2046,7 +2046,7 @@ again: generic_iter_t *iter = (generic_iter_t*) vm_get_plocal(exec, field); tree_t *res = colm_list_iter_advance( prg, &sp, iter ); - //treeUpref( res ); + //colm_tree_upref( res ); vm_push_tree( res ); break; } @@ -2058,7 +2058,7 @@ again: generic_iter_t *iter = (generic_iter_t*) vm_get_plocal(exec, field); tree_t *res = colm_map_iter_advance( prg, &sp, iter ); - //treeUpref( res ); + //colm_tree_upref( res ); vm_push_tree( res ); break; } @@ -2070,7 +2070,7 @@ again: generic_iter_t *iter = (generic_iter_t*) vm_get_plocal(exec, field); tree_t *tree = colm_list_iter_deref_cur( prg, iter ); - //treeUpref( tree ); + //colm_tree_upref( tree ); vm_push_tree( tree ); break; } @@ -2117,15 +2117,15 @@ again: } tree_t *result = matched ? tree : 0; - treeUpref( result ); + colm_tree_upref( result ); vm_push_tree( result ? tree : 0 ); int b; for ( b = 1; b <= numBindings; b++ ) { - treeUpref( bindings[b] ); + colm_tree_upref( bindings[b] ); vm_push_tree( bindings[b] ); } - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } @@ -2138,7 +2138,7 @@ again: stream_append_tree( prg, sp, parser->input, input ); vm_push_parser( parser ); - treeDownref( prg, sp, input ); + colm_tree_downref( prg, sp, input ); break; } @@ -2174,7 +2174,7 @@ again: struct stream_impl *si = streamToImpl( ((parser_t*)pptr)->input ); stream_undo_append( prg, sp, si, input, len ); - treeDownref( prg, sp, input ); + colm_tree_downref( prg, sp, input ); break; } @@ -2221,7 +2221,7 @@ again: struct stream_impl *si = streamToImpl( ((parser_t*)pptr)->input ); stream_undo_append_stream( prg, sp, si, input, len ); - treeDownref( prg, sp, input ); + colm_tree_downref( prg, sp, input ); break; } @@ -2248,7 +2248,7 @@ again: debug( prg, REALM_BYTECODE, "IN_SET_ERROR\n" ); tree_t *error = vm_pop_tree(); - treeDownref( prg, sp, prg->error ); + colm_tree_downref( prg, sp, prg->error ); prg->error = error; break; } @@ -2257,7 +2257,7 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_ERROR\n" ); vm_pop_tree(); - treeUpref( prg->error ); + colm_tree_upref( prg->error ); vm_push_tree( prg->error ); break; } @@ -2591,16 +2591,16 @@ again: tree_t *len = vm_pop_tree(); struct pda_run *pdaRun = exec->parser != 0 ? exec->parser->pdaRun : 0; tree_t *string = stream_pull_bc( prg, sp, pdaRun, stream, len ); - treeUpref( string ); + colm_tree_upref( string ); vm_push_tree( string ); /* Single unit. */ - treeUpref( string ); + colm_tree_upref( string ); rcode_code( exec, IN_INPUT_PULL_BKT ); rcode_word( exec, (word_t) string ); rcode_unit_term( exec ); - //treeDownref( prg, sp, len ); + //colm_tree_downref( prg, sp, len ); break; } @@ -2611,10 +2611,10 @@ again: tree_t *len = vm_pop_tree(); struct pda_run *pdaRun = exec->parser != 0 ? exec->parser->pdaRun : 0; tree_t *string = stream_pull_bc( prg, sp, pdaRun, stream, len ); - treeUpref( string ); + colm_tree_upref( string ); vm_push_tree( string ); - //treeDownref( prg, sp, len ); + //colm_tree_downref( prg, sp, len ); break; } case IN_INPUT_PULL_BKT: { @@ -2626,7 +2626,7 @@ again: debug( prg, REALM_BYTECODE, "IN_INPUT_PULL_BKT\n" ); undo_pull( prg, stream, string ); - treeDownref( prg, sp, string ); + colm_tree_downref( prg, sp, string ); break; } case IN_INPUT_PUSH_WV: { @@ -2642,7 +2642,7 @@ again: rcode_word( exec, len ); rcode_unit_term( exec ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } case IN_INPUT_PUSH_IGNORE_WV: { @@ -2658,7 +2658,7 @@ again: rcode_word( exec, len ); rcode_unit_term( exec ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } case IN_INPUT_PUSH_BKT: { @@ -2711,7 +2711,7 @@ again: debug( prg, REALM_BYTECODE, "IN_CONS_OBJECT %hd\n", langElId ); - tree_t *replTree = constructObject( prg, 0, 0, langElId ); + tree_t *replTree = colm_construct_object( prg, 0, 0, langElId ); vm_push_tree( replTree ); break; } @@ -2735,7 +2735,7 @@ again: assert( bindings[b] != 0 ); } - tree_t *replTree = constructTree( prg, 0, bindings, rootNode ); + tree_t *replTree = colm_construct_tree( prg, 0, bindings, rootNode ); vm_push_tree( replTree ); break; @@ -2748,8 +2748,8 @@ again: /* Pop the string we are constructing the token from. */ str_t *str = vm_pop_string(); - tree_t *res = constructTerm( prg, tokenId, str->value ); - treeUpref( res ); + tree_t *res = colm_construct_term( prg, tokenId, str->value ); + colm_tree_upref( res ); vm_push_tree( res ); break; } @@ -2764,9 +2764,9 @@ again: for ( i = nargs-1; i >= 0; i-- ) arg[i] = vm_pop_tree(); - tree_t *result = constructToken( prg, arg, nargs ); + tree_t *result = colm_construct_token( prg, arg, nargs ); for ( i = 1; i < nargs; i++ ) - treeDownref( prg, sp, arg[i] ); + colm_tree_downref( prg, sp, arg[i] ); vm_push_tree( result ); break; } @@ -2783,7 +2783,7 @@ again: tree_t *result = makeTree( prg, arg, nargs ); for ( i = 1; i < nargs; i++ ) - treeDownref( prg, sp, arg[i] ); + colm_tree_downref( prg, sp, arg[i] ); vm_push_tree( result ); break; @@ -2796,8 +2796,8 @@ again: tree_t *tree = vm_pop_tree(); tree_t *res = castTree( prg, langElId, tree ); - treeUpref( res ); - treeDownref( prg, sp, tree ); + colm_tree_upref( res ); + colm_tree_downref( prg, sp, tree ); vm_push_tree( res ); break; } @@ -2942,9 +2942,9 @@ again: tree_t *tree = vm_pop_tree(); head_t *data = stringCopy( prg, tree->tokdata ); tree_t *str = constructString( prg, data ); - treeUpref( str ); + colm_tree_upref( str ); vm_push_tree( str ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } case IN_SET_TOKEN_DATA_WC: { @@ -2956,8 +2956,8 @@ again: stringFree( prg, tree->tokdata ); tree->tokdata = head; - treeDownref( prg, sp, tree ); - treeDownref( prg, sp, val ); + colm_tree_downref( prg, sp, tree ); + colm_tree_downref( prg, sp, val ); break; } case IN_SET_TOKEN_DATA_WV: { @@ -2975,8 +2975,8 @@ again: rcode_word( exec, (word_t)oldval ); rcode_unit_term( exec ); - treeDownref( prg, sp, tree ); - treeDownref( prg, sp, val ); + colm_tree_downref( prg, sp, tree ); + colm_tree_downref( prg, sp, val ); break; } case IN_SET_TOKEN_DATA_BKT: { @@ -2989,7 +2989,7 @@ again: head_t *head = (head_t*)oldval; stringFree( prg, tree->tokdata ); tree->tokdata = head; - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } case IN_GET_TOKEN_POS_R: { @@ -3000,7 +3000,7 @@ again: if ( tree->tokdata->location ) integer = tree->tokdata->location->byte; vm_push_value( integer ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } case IN_GET_TOKEN_LINE_R: { @@ -3012,7 +3012,7 @@ again: integer = tree->tokdata->location->line; vm_push_value( integer ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); break; } case IN_GET_MATCH_LENGTH_R: { @@ -3027,7 +3027,7 @@ again: head_t *s = stringCopy( prg, exec->parser->pdaRun->tokdata ); tree_t *tree = constructString( prg, s ); - treeUpref( tree ); + colm_tree_upref( tree ); vm_push_tree( tree ); break; } @@ -3037,7 +3037,7 @@ again: list_t *list = vm_pop_list(); long len = colm_list_length( list ); value_t res = len; - treeDownref( prg, sp, (tree_t*)list ); + colm_tree_downref( prg, sp, (tree_t*)list ); vm_push_value( res ); break; } @@ -3075,10 +3075,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_LIST_MEM_WC\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *val = getListMemSplit( prg, (list_t*)obj, field ); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; } @@ -3089,10 +3089,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_LIST_MEM_WV\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *val = getListMemSplit( prg, (list_t*)obj, field ); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); /* Set up the reverse instruction. */ @@ -3107,10 +3107,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_LIST_MEM_BKT\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *res = getListMemSplit( prg, (list_t*)obj, field ); - treeUpref( res ); + colm_tree_upref( res ); vm_push_tree( res ); break; } @@ -3136,10 +3136,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_VLIST_MEM_WC\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *val = getListMemSplit( prg, (list_t*)obj, field ); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; } @@ -3150,10 +3150,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_VLIST_MEM_WV\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *val = getListMemSplit( prg, (list_t*)obj, field ); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); /* Set up the reverse instruction. */ @@ -3168,10 +3168,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_VLIST_MEM_BKT\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *res = getListMemSplit( prg, (list_t*)obj, field ); - treeUpref( res ); + colm_tree_upref( res ); vm_push_tree( res ); break; } @@ -3183,11 +3183,11 @@ again: tree_t *obj = vm_pop_tree(); tree_t *val = getParserMem( (parser_t*)obj, field ); - treeUpref( val ); + colm_tree_upref( val ); /* In at least one case we extract the result on a parser with ref * one. Do it after. */ - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); vm_push_tree( val ); break; } @@ -3214,7 +3214,7 @@ again: value_t res = len; vm_push_value( res ); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); break; } case IN_GET_MAP_MEM_R: { @@ -3237,10 +3237,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_MAP_MEM_WC\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *val = getListMemSplit( prg, (list_t*)obj, field ); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); break; } @@ -3251,10 +3251,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_MAP_MEM_WV\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *val = getListMemSplit( prg, (list_t*)obj, field ); - treeUpref( val ); + colm_tree_upref( val ); vm_push_tree( val ); /* Set up the reverse instruction. */ @@ -3269,10 +3269,10 @@ again: debug( prg, REALM_BYTECODE, "IN_GET_MAP_MEM_BKT\n" ); tree_t *obj = vm_pop_tree(); - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); tree_t *res = getListMemSplit( prg, (list_t*)obj, field ); - treeUpref( res ); + colm_tree_upref( res ); vm_push_tree( res ); break; } @@ -3403,7 +3403,7 @@ again: /* Return the yield result on the top of the stack. */ tree_t *result = uiter->ref.kid != 0 ? prg->trueVal : prg->falseVal; - //treeUpref( result ); + //colm_tree_upref( result ); vm_push_tree( result ); } break; @@ -3540,9 +3540,9 @@ again: tree_t *in = vm_pop_tree(); head_t *head = stringToUpper( in->tokdata ); tree_t *upper = constructString( prg, head ); - treeUpref( upper ); + colm_tree_upref( upper ); vm_push_tree( upper ); - treeDownref( prg, sp, in ); + colm_tree_downref( prg, sp, in ); break; } case IN_TO_LOWER: { @@ -3551,9 +3551,9 @@ again: tree_t *in = vm_pop_tree(); head_t *head = stringToLower( in->tokdata ); tree_t *lower = constructString( prg, head ); - treeUpref( lower ); + colm_tree_upref( lower ); vm_push_tree( lower ); - treeDownref( prg, sp, in ); + colm_tree_downref( prg, sp, in ); break; } case IN_OPEN_FILE: { @@ -3563,8 +3563,8 @@ again: tree_t *name = vm_pop_tree(); stream_t *res = colm_stream_open_file( prg, name, mode ); vm_push_stream( res ); - treeDownref( prg, sp, name ); - treeDownref( prg, sp, mode ); + colm_tree_downref( prg, sp, name ); + colm_tree_downref( prg, sp, mode ); break; } case IN_GET_STDIN: { @@ -3616,7 +3616,7 @@ again: raise( WTERMSIG( res ) ); res = WEXITSTATUS( res ); - treeDownref( prg, sp, (tree_t*)cmd ); + colm_tree_downref( prg, sp, (tree_t*)cmd ); value_t val = res; vm_push_value( val ); @@ -3636,7 +3636,7 @@ again: word_t res = strAtoi( str->value ); value_t integer = res; vm_push_value( integer ); - treeDownref( prg, sp, (tree_t*)str ); + colm_tree_downref( prg, sp, (tree_t*)str ); break; } case IN_STR_ATOO: { @@ -3646,7 +3646,7 @@ again: word_t res = strAtoo( str->value ); value_t integer = res; vm_push_value( integer ); - treeDownref( prg, sp, (tree_t*)str ); + colm_tree_downref( prg, sp, (tree_t*)str ); break; } case IN_STR_UORD8: { @@ -3656,7 +3656,7 @@ again: word_t res = strUord8( str->value ); value_t integer = res; vm_push_value( integer ); - treeDownref( prg, sp, (tree_t*)str ); + colm_tree_downref( prg, sp, (tree_t*)str ); break; } case IN_STR_UORD16: { @@ -3666,7 +3666,7 @@ again: word_t res = strUord16( str->value ); value_t integer = res; vm_push_value( integer ); - treeDownref( prg, sp, (tree_t*)str ); + colm_tree_downref( prg, sp, (tree_t*)str ); break; } case IN_STR_PREFIX: { @@ -3676,9 +3676,9 @@ again: value_t len = vm_pop_value(); str_t *res = string_prefix( prg, str, (long) len ); - treeUpref( (tree_t*) res ); + colm_tree_upref( (tree_t*) res ); vm_push_string( res ); - treeDownref( prg, sp, (tree_t*)str ); + colm_tree_downref( prg, sp, (tree_t*)str ); break; } case IN_STR_SUFFIX: { @@ -3688,9 +3688,9 @@ again: value_t pos = vm_pop_value(); str_t *res = string_suffix( prg, str, (long) pos ); - treeUpref( (tree_t*) res ); + colm_tree_upref( (tree_t*) res ); vm_push_string( res ); - treeDownref( prg, sp, (tree_t*)str ); + colm_tree_downref( prg, sp, (tree_t*)str ); break; } case IN_PREFIX: { @@ -3700,9 +3700,9 @@ again: str_t *str = vm_pop_string(); str_t *res = string_prefix( prg, str, (long) len ); - treeUpref( (tree_t*) res ); + colm_tree_upref( (tree_t*) res ); vm_push_string( res ); - treeDownref( prg, sp, (tree_t*)str ); + colm_tree_downref( prg, sp, (tree_t*)str ); break; } case IN_SUFFIX: { @@ -3712,9 +3712,9 @@ again: str_t *str = vm_pop_string(); str_t *res = string_suffix( prg, str, (long) pos ); - treeUpref( (tree_t*) res ); + colm_tree_upref( (tree_t*) res ); vm_push_string( res ); - treeDownref( prg, sp, (tree_t*)str ); + colm_tree_downref( prg, sp, (tree_t*)str ); break; } case IN_LOAD_ARG0: { @@ -3725,7 +3725,7 @@ again: /* tree_t comes back upreffed. */ tree_t *tree = construct_arg0( prg, prg->argc, prg->argv ); tree_t *prev = colm_struct_get_field( prg->global, tree_t*, field ); - treeDownref( prg, sp, prev ); + colm_tree_downref( prg, sp, prev ); colm_struct_set_field( prg->global, tree_t*, field, tree ); break; } @@ -3757,7 +3757,7 @@ again: list_el_t *listEl = colm_struct_to_list_el( prg, s, genId ); colm_list_prepend( list, listEl ); - //treeUpref( prg->trueVal ); + //colm_tree_upref( prg->trueVal ); vm_push_tree( prg->trueVal ); break; } @@ -3773,7 +3773,7 @@ again: list_el_t *listEl = colm_struct_to_list_el( prg, s, genId ); colm_list_prepend( list, listEl ); - //treeUpref( prg->trueVal ); + //colm_tree_upref( prg->trueVal ); vm_push_tree( prg->trueVal ); /* Set up reverse code. Needs no args. */ @@ -3801,7 +3801,7 @@ again: list_el_t *listEl = colm_struct_to_list_el( prg, s, genId ); colm_list_append( list, listEl ); - //treeUpref( prg->trueVal ); + //colm_tree_upref( prg->trueVal ); vm_push_tree( prg->trueVal ); break; } @@ -3817,7 +3817,7 @@ again: list_el_t *listEl = colm_struct_to_list_el( prg, s, genId ); colm_list_append( list, listEl ); - //treeUpref( prg->trueVal ); + //colm_tree_upref( prg->trueVal ); vm_push_tree( prg->trueVal ); /* Set up reverse code. Needs no args. */ @@ -3958,7 +3958,7 @@ again: vm_push_struct( strct ); if ( map->genericInfo->keyType == TYPE_TREE ) - treeDownref( prg, sp, key ); + colm_tree_downref( prg, sp, key ); break; } case IN_MAP_INSERT_WC: { @@ -3974,7 +3974,7 @@ again: colm_map_insert( prg, map, mapEl ); - //treeUpref( prg->trueVal ); + //colm_tree_upref( prg->trueVal ); vm_push_tree( prg->trueVal ); break; } @@ -3991,7 +3991,7 @@ again: map_el_t *inserted = colm_map_insert( prg, map, mapEl ); - //treeUpref( prg->trueVal ); + //colm_tree_upref( prg->trueVal ); vm_push_tree( prg->trueVal ); rcode_code( exec, IN_FN ); @@ -4036,7 +4036,7 @@ again: colm_map_detach( prg, map, mapEl ); - //treeUpref( prg->trueVal ); + //colm_tree_upref( prg->trueVal ); vm_push_tree( prg->trueVal ); break; } @@ -4047,7 +4047,7 @@ again: tree_t *key = vm_pop_tree(); struct tree_pair pair = mapRemove( prg, (map_t*)obj, key ); - treeUpref( pair.val ); + colm_tree_upref( pair.val ); vm_push_tree( pair.val ); /* Reverse instruction. */ @@ -4057,8 +4057,8 @@ again: rcode_word( exec, (word_t)pair.val ); rcode_unit_term( exec ); - treeDownref( prg, sp, obj ); - treeDownref( prg, sp, key ); + colm_tree_downref( prg, sp, obj ); + colm_tree_downref( prg, sp, key ); break; } case IN_MAP_DETACH_BKT: { @@ -4077,7 +4077,7 @@ again: mapUnremove( prg, (map_t*)obj, key, val ); #endif - treeDownref( prg, sp, obj ); + colm_tree_downref( prg, sp, obj ); break; } case IN_VMAP_INSERT_WC: { @@ -4092,7 +4092,7 @@ again: colm_vmap_insert( prg, map, key, value ); - //treeUpref( prg->trueVal ); + //colm_tree_upref( prg->trueVal ); vm_push_tree( prg->trueVal ); break; } @@ -4107,7 +4107,7 @@ again: colm_vmap_remove( prg, map, key ); - //treeUpref( prg->trueVal ); + //colm_tree_upref( prg->trueVal ); vm_push_tree( prg->trueVal ); break; } @@ -4125,7 +4125,7 @@ again: vm_push_tree( result ); if ( map->genericInfo->keyType == TYPE_TREE ) - treeDownref( prg, sp, key ); + colm_tree_downref( prg, sp, key ); break; } case IN_VLIST_PUSH_TAIL_WC: { @@ -4234,7 +4234,7 @@ again: if ( fi->retTree ) { /* Problem here. */ - treeDownref( prg, sp, retVal ); + colm_tree_downref( prg, sp, retVal ); } read_half( unwind_len ); @@ -4299,7 +4299,7 @@ again: tree_t *w; read_tree( w ); debug( prg, REALM_BYTECODE, "IN_LOAD_TREE %p\n", w ); - treeDownref( prg, sp, w ); + colm_tree_downref( prg, sp, w ); break; } case IN_LOAD_WORD: { @@ -4311,7 +4311,7 @@ again: tree_t *restore; read_tree( restore ); debug( prg, REALM_BYTECODE, "IN_RESTORE_LHS\n" ); - treeDownref( prg, sp, restore ); + colm_tree_downref( prg, sp, restore ); break; } @@ -4365,7 +4365,7 @@ again: debug( prg, REALM_BYTECODE, "IN_PARSE_APPEND_STREAM_BKT\n" ); - treeDownref( prg, sp, input ); + colm_tree_downref( prg, sp, input ); break; } @@ -4375,7 +4375,7 @@ again: debug( prg, REALM_BYTECODE, "IN_INPUT_PULL_BKT\n" ); - treeDownref( prg, sp, string ); + colm_tree_downref( prg, sp, string ); break; } case IN_INPUT_PUSH_BKT: { @@ -4412,7 +4412,7 @@ again: debug( prg, REALM_BYTECODE, "IN_SET_FIELD_TREE_BKT %hd\n", field ); - treeDownref( prg, sp, val ); + colm_tree_downref( prg, sp, val ); break; } case IN_SET_STRUCT_BKT: { @@ -4423,7 +4423,7 @@ again: debug( prg, REALM_BYTECODE, "IN_SET_STRUCT_BKT %hd\n", field ); - treeDownref( prg, sp, val ); + colm_tree_downref( prg, sp, val ); break; } case IN_SET_STRUCT_VAL_BKT: { @@ -4510,8 +4510,8 @@ again: debug( prg, REALM_BYTECODE, "IN_MAP_DETACH_BKT\n" ); - treeDownref( prg, sp, key ); - treeDownref( prg, sp, val ); + colm_tree_downref( prg, sp, key ); + colm_tree_downref( prg, sp, val ); break; }} break; diff --git a/src/ctinput.cc b/src/ctinput.cc index 8789320c..d16d69cb 100644 --- a/src/ctinput.cc +++ b/src/ctinput.cc @@ -476,7 +476,7 @@ extern "C" void internalSendNamedLangEl( program_t *prg, tree_t **sp, colm_increment_steps( pdaRun ); - parse_tree_t *parseTree = parseTreeAllocate( prg ); + parse_tree_t *parseTree = parse_tree_allocate( prg ); parseTree->id = input->tree->id; parseTree->flags |= PF_NAMED; parseTree->shadow = input; diff --git a/src/input.c b/src/input.c index 0f9dbd07..fa797f90 100644 --- a/src/input.c +++ b/src/input.c @@ -64,7 +64,7 @@ void colm_clear_source_stream( struct colm_program *prg, case RunBufTokenType: case RunBufIgnoreType: - treeDownref( prg, sp, buf->tree ); + colm_tree_downref( prg, sp, buf->tree ); break; case RunBufSourceType: break; @@ -382,7 +382,7 @@ void colm_clear_stream_impl( struct colm_program *prg, tree_t **sp, struct strea case RunBufTokenType: case RunBufIgnoreType: - treeDownref( prg, sp, buf->tree ); + colm_tree_downref( prg, sp, buf->tree ); break; case RunBufSourceType: @@ -673,7 +673,7 @@ static int _consumeData( program_t *prg, tree_t **sp, struct stream_impl *is, RunBuf *runBuf = inputStreamPopHead( is ); //if ( runBuf->type == RunBufSourceType ) { // stream_t *stream = (stream_t*)runBuf->tree; - // treeDownref( prg, sp, (tree_t*) stream ); + // colm_tree_downref( prg, sp, (tree_t*) stream ); //} free( runBuf ); } @@ -51,7 +51,7 @@ void colm_list_iter_destroy( program_t *prg, tree_t ***psp, generic_iter_t *iter assert( iter->yieldSize == curStackSize ); vm_popn( iter->yieldSize ); for ( i = 0; i < iter->argSize; i++ ) - treeDownref( prg, sp, vm_pop_tree() ); + colm_tree_downref( prg, sp, vm_pop_tree() ); iter->type = 0; *psp = sp; } @@ -137,7 +137,7 @@ value_t colm_viter_deref_cur( program_t *prg, generic_iter_t *iter ) value_t value = colm_struct_get_field( s, value_t, 0 ); if ( gi->valueType == TYPE_TREE ) - treeUpref( (tree_t*)value ); + colm_tree_upref( (tree_t*)value ); return value; } @@ -232,7 +232,7 @@ void colm_tree_iter_destroy( program_t *prg, tree_t ***psp, tree_iter_t *iter ) assert( iter->yieldSize == curStackSize ); vm_popn( iter->yieldSize ); for ( i = 0; i < iter->argSize; i++ ) - treeDownref( prg, sp, vm_pop_tree() ); + colm_tree_downref( prg, sp, vm_pop_tree() ); iter->type = 0; *psp = sp; } @@ -247,7 +247,7 @@ void colm_rev_tree_iter_destroy( struct colm_program *prg, tree_t ***psp, rev_tr assert( riter->yieldSize == curStackSize ); vm_popn( riter->yieldSize ); for ( i = 0; i < riter->argSize; i++ ) - treeDownref( prg, sp, vm_pop_tree() ); + colm_tree_downref( prg, sp, vm_pop_tree() ); riter->type = 0; *psp = sp; } @@ -89,7 +89,7 @@ value_t colm_vlist_detach_tail( struct colm_program *prg, list_t *list ) value_t val = colm_struct_get_field( s, value_t, 0 ); if ( list->genericInfo->valueType == TYPE_TREE ) - treeUpref( (tree_t*)val ); + colm_tree_upref( (tree_t*)val ); return val; } @@ -105,7 +105,7 @@ value_t colm_vlist_detach_head( struct colm_program *prg, list_t *list ) value_t val = colm_struct_get_field( s, value_t, 0 ); if ( list->genericInfo->valueType == TYPE_TREE ) - treeUpref( (tree_t*) val ); + colm_tree_upref( (tree_t*) val ); return val; } @@ -558,7 +558,7 @@ map_el_t *mapCopyBranch( program_t *prg, map_t *map, map_el_t *el, kid_t *oldNex static long map_cmp( program_t *prg, map_t *map, const tree_t *tree1, const tree_t *tree2 ) { if ( map->genericInfo->keyType == TYPE_TREE ) { - return cmpTree( prg, tree1, tree2 ); + return colm_cmp_tree( prg, tree1, tree2 ); } else { if ( (long)tree1 < (long)tree2 ) @@ -686,7 +686,7 @@ tree_t *colm_vmap_find( program_t *prg, map_t *map, tree_t *key ) tree_t *val = colm_struct_get_field( s, tree_t*, 0 ); if ( map->genericInfo->valueType == TYPE_TREE ) - treeUpref( val ); + colm_tree_upref( val ); return val; } @@ -52,6 +52,8 @@ map_el_t *mapDetach( program_t *prg, map_t *map, map_el_t *element ); map_el_t *mapCopyBranch( program_t *prg, map_t *map, map_el_t *el, kid_t *oldNextDown, kid_t **newNextDown ); +struct tree_pair mapRemove( program_t *prg, map_t *map, tree_t *key ); + long cmpTree( program_t *prg, const tree_t *tree1, const tree_t *tree2 ); void mapImplRemoveEl( program_t *prg, map_t *map, map_el_t *element ); diff --git a/src/pdarun.c b/src/pdarun.c index cbbd1b45..5a0e180e 100644 --- a/src/pdarun.c +++ b/src/pdarun.c @@ -108,7 +108,7 @@ head_t *colm_stream_pull( program_t *prg, tree_t **sp, struct pda_run *pdaRun, s char *dest = runBuf->data + runBuf->length; is->funcs->getData( is, dest, length ); - location_t *loc = locationAllocate( prg ); + location_t *loc = location_allocate( prg ); is->funcs->consumeData( prg, sp, is, length, loc ); runBuf->length += length; @@ -126,7 +126,7 @@ head_t *colm_stream_pull( program_t *prg, tree_t **sp, struct pda_run *pdaRun, s char *dest = (char*)head->data; is->funcs->getData( is, dest, length ); - location_t *loc = locationAllocate( prg ); + location_t *loc = location_allocate( prg ); is->funcs->consumeData( prg, sp, is, length, loc ); head->location = loc; @@ -160,7 +160,7 @@ void colm_undo_stream_push( program_t *prg, tree_t **sp, struct stream_impl *is, { if ( length < 0 ) { tree_t *tree = is->funcs->undoPrependTree( is ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); } else { is->funcs->undoPrependData( is, length ); @@ -261,7 +261,7 @@ static void send_back( program_t *prg, tree_t **sp, struct pda_run *pdaRun, parseTree->flags &= ~PF_HAS_RCODE; } - treeUpref( parseTree->shadow->tree ); + colm_tree_upref( parseTree->shadow->tree ); send_back_tree( is, parseTree->shadow->tree ); } @@ -292,9 +292,9 @@ static void send_back( program_t *prg, tree_t **sp, struct pda_run *pdaRun, } /* Downref the tree that was sent back and free the kid. */ - treeDownref( prg, sp, parseTree->shadow->tree ); - kidFree( prg, parseTree->shadow ); - parseTreeFree( prg, parseTree ); + colm_tree_downref( prg, sp, parseTree->shadow->tree ); + kid_free( prg, parseTree->shadow ); + parse_tree_free( prg, parseTree ); } static void set_region( struct pda_run *pdaRun, int emptyIgnore, parse_tree_t *tree ) @@ -313,8 +313,8 @@ static void ignore_tree( program_t *prg, struct pda_run *pdaRun, tree_t *tree ) colm_increment_steps( pdaRun ); - parse_tree_t *parseTree = parseTreeAllocate( prg ); - parseTree->shadow = kidAllocate( prg ); + parse_tree_t *parseTree = parse_tree_allocate( prg ); + parseTree->shadow = kid_allocate( prg ); parseTree->shadow->tree = tree; parseTree->next = pdaRun->accumIgnore; @@ -334,9 +334,9 @@ static void ignore_tree_art( program_t *prg, struct pda_run *pdaRun, tree_t *tre colm_increment_steps( pdaRun ); - parse_tree_t *parseTree = parseTreeAllocate( prg ); + parse_tree_t *parseTree = parse_tree_allocate( prg ); parseTree->flags |= PF_ARTIFICIAL; - parseTree->shadow = kidAllocate( prg ); + parseTree->shadow = kid_allocate( prg ); parseTree->shadow->tree = tree; parseTree->next = pdaRun->accumIgnore; @@ -355,8 +355,8 @@ kid_t *make_token_with_data( program_t *prg, struct pda_run *pdaRun, kid_t *attrs = allocAttrs( prg, objectLength ); kid_t *input = 0; - input = kidAllocate( prg ); - input->tree = treeAllocate( prg ); + input = kid_allocate( prg ); + input->tree = tree_allocate( prg ); debug( prg, REALM_PARSE, "made token %p\n", input->tree ); @@ -377,7 +377,7 @@ kid_t *make_token_with_data( program_t *prg, struct pda_run *pdaRun, pdaRun->mark[ca->mark_leave] - pdaRun->mark[ca->mark_enter] ); tree_t *string = constructString( prg, data ); - treeUpref( string ); + colm_tree_upref( string ); colm_tree_set_field( prg, input->tree, ca->offset, string ); } } @@ -404,7 +404,7 @@ static void report_parse_error( program_t *prg, tree_t **sp, struct pda_run *pda * beginning of the stream. */ if ( deepest == 0 ) { errorHead = stringAllocFull( prg, "<input>:1:1: parse error", 32 ); - errorHead->location = locationAllocate( prg ); + errorHead->location = location_allocate( prg ); errorHead->location->line = 1; errorHead->location->column = 1; } @@ -434,7 +434,7 @@ static void report_parse_error( program_t *prg, tree_t **sp, struct pda_run *pda errorHead = stringAllocFull( prg, formatted, strlen(formatted) ); free( formatted ); - errorHead->location = locationAllocate( prg ); + errorHead->location = location_allocate( prg ); errorHead->location->name = deepest->location->name; errorHead->location->line = line; @@ -443,9 +443,9 @@ static void report_parse_error( program_t *prg, tree_t **sp, struct pda_run *pda } tree_t *tree = constructString( prg, errorHead ); - treeDownref( prg, sp, pdaRun->parseErrorText ); + colm_tree_downref( prg, sp, pdaRun->parseErrorText ); pdaRun->parseErrorText = tree; - treeUpref( pdaRun->parseErrorText ); + colm_tree_upref( pdaRun->parseErrorText ); } static void attach_right_ignore( program_t *prg, tree_t **sp, @@ -518,13 +518,13 @@ static void attach_right_ignore( program_t *prg, tree_t **sp, * ignore. */ tree_t *rightIgnore = 0; - rightIgnore = treeAllocate( prg ); + rightIgnore = tree_allocate( prg ); rightIgnore->id = LEL_ID_IGNORE; rightIgnore->child = ignoreKid; tree_t *pushTo = parseTree->shadow->tree; - pushTo = pushRightIgnore( prg, pushTo, rightIgnore ); + pushTo = push_right_ignore( prg, pushTo, rightIgnore ); parseTree->shadow->tree = pushTo; @@ -574,13 +574,13 @@ static void attach_left_ignore( program_t *prg, tree_t **sp, kid_t *ignoreKid = dataChild; /* Make the ignore list for the left-ignore. */ - tree_t *leftIgnore = treeAllocate( prg ); + tree_t *leftIgnore = tree_allocate( prg ); leftIgnore->id = LEL_ID_IGNORE; leftIgnore->child = ignoreKid; tree_t *pushTo = parseTree->shadow->tree; - pushTo = pushLeftIgnore( prg, pushTo, leftIgnore ); + pushTo = push_left_ignore( prg, pushTo, leftIgnore ); parseTree->shadow->tree = pushTo; @@ -638,7 +638,7 @@ static void detach_right_ignore( program_t *prg, tree_t **sp, pdaRun->accumIgnore = last; - treeDownref( prg, sp, rightIgnore ); + colm_tree_downref( prg, sp, rightIgnore ); } } @@ -691,7 +691,7 @@ static void detach_left_ignore( program_t *prg, tree_t **sp, pdaRun->accumIgnore = last; } - treeDownref( prg, sp, leftIgnore ); + colm_tree_downref( prg, sp, leftIgnore ); } static int is_parser_stop_finished( struct pda_run *pdaRun ) @@ -734,7 +734,7 @@ static head_t *extract_match( program_t *prg, tree_t **sp, struct pda_run *pdaRu char *dest = runBuf->data + runBuf->length; is->funcs->getData( is, dest, length ); - location_t *location = locationAllocate( prg ); + location_t *location = location_allocate( prg ); is->funcs->consumeData( prg, sp, is, length, location ); runBuf->length += length; @@ -772,7 +772,7 @@ static head_t *peekMatch( program_t *prg, struct pda_run *pdaRun, struct stream_ head_t *head = colm_string_alloc_pointer( prg, dest, length ); - head->location = locationAllocate( prg ); + head->location = location_allocate( prg ); head->location->line = is->line; head->location->column = is->column; head->location->byte = is->byte; @@ -793,7 +793,7 @@ static void send_ignore( program_t *prg, tree_t **sp, debug( prg, REALM_PARSE, "ignoring: %.*s\n", ignoreStr->length, ignoreStr->data ); - tree_t *tree = treeAllocate( prg ); + tree_t *tree = tree_allocate( prg ); tree->refs = 1; tree->id = id; tree->tokdata = ignoreStr; @@ -818,7 +818,7 @@ static void send_token( program_t *prg, tree_t **sp, colm_increment_steps( pdaRun ); - parse_tree_t *parseTree = parseTreeAllocate( prg ); + parse_tree_t *parseTree = parse_tree_allocate( prg ); parseTree->id = input->tree->id; parseTree->shadow = input; @@ -831,12 +831,12 @@ static void send_token( program_t *prg, tree_t **sp, static void send_tree( program_t *prg, tree_t **sp, struct pda_run *pdaRun, struct stream_impl *is ) { - kid_t *input = kidAllocate( prg ); + kid_t *input = kid_allocate( prg ); input->tree = is->funcs->consumeTree( is ); colm_increment_steps( pdaRun ); - parse_tree_t *parseTree = parseTreeAllocate( prg ); + parse_tree_t *parseTree = parse_tree_allocate( prg ); parseTree->id = input->tree->id; parseTree->flags |= PF_ARTIFICIAL; parseTree->shadow = input; @@ -858,8 +858,8 @@ static void send_collect_ignore( program_t *prg, tree_t **sp, int emptyIgnore = pdaRun->accumIgnore == 0; /* Make the token data. */ - head_t *tokdata = headAllocate( prg ); - tokdata->location = locationAllocate( prg ); + head_t *tokdata = head_allocate( prg ); + tokdata->location = location_allocate( prg ); tokdata->location->line = is->line; tokdata->location->column = is->column; tokdata->location->byte = is->byte; @@ -872,7 +872,7 @@ static void send_collect_ignore( program_t *prg, tree_t **sp, colm_increment_steps( pdaRun ); - parse_tree_t *parseTree = parseTreeAllocate( prg ); + parse_tree_t *parseTree = parse_tree_allocate( prg ); parseTree->id = input->tree->id; parseTree->shadow = input; @@ -900,14 +900,14 @@ static void send_eof( program_t *prg, tree_t **sp, struct pda_run *pdaRun, struc colm_increment_steps( pdaRun ); - head_t *head = headAllocate( prg ); - head->location = locationAllocate( prg ); + head_t *head = head_allocate( prg ); + head->location = location_allocate( prg ); head->location->line = is->line; head->location->column = is->column; head->location->byte = is->byte; - kid_t *input = kidAllocate( prg ); - input->tree = treeAllocate( prg ); + kid_t *input = kid_allocate( prg ); + input->tree = tree_allocate( prg ); input->tree->refs = 1; input->tree->id = prg->rtd->eofLelIds[pdaRun->parserId]; @@ -918,7 +918,7 @@ static void send_eof( program_t *prg, tree_t **sp, struct pda_run *pdaRun, struc pdaRun->preRegion = get_next_pre_region( pdaRun ); pdaRun->fsm_cs = pdaRun->fsm_tables->entryByRegion[pdaRun->region]; - parse_tree_t *parseTree = parseTreeAllocate( prg ); + parse_tree_t *parseTree = parse_tree_allocate( prg ); parseTree->id = input->tree->id; parseTree->shadow = input; @@ -966,9 +966,9 @@ static void push_bt_point( program_t *prg, struct pda_run *pdaRun ) ( tree != 0 && tree->tokdata != 0 && tree->tokdata->location != 0 ) ? tree->tokdata->location->byte : 0 ); - kid_t *kid = kidAllocate( prg ); + kid_t *kid = kid_allocate( prg ); kid->tree = tree; - treeUpref( tree ); + colm_tree_upref( tree ); kid->next = pdaRun->btPoint; pdaRun->btPoint = kid; } @@ -1122,11 +1122,11 @@ free_tree: } if ( pt->shadow != 0 ) { - treeDownref( prg, sp, pt->shadow->tree ); - kidFree( prg, pt->shadow ); + colm_tree_downref( prg, sp, pt->shadow->tree ); + kid_free( prg, pt->shadow ); } - parseTreeFree( prg, pt ); + parse_tree_free( prg, pt ); /* Any trees to downref? */ if ( sp != top ) { @@ -1147,7 +1147,7 @@ void colm_pda_clear( program_t *prg, tree_t **sp, struct pda_run *pdaRun ) ref_t *ref = pdaRun->tokenList; while ( ref != 0 ) { ref_t *next = ref->next; - kidFree( prg, (kid_t*)ref ); + kid_free( prg, (kid_t*)ref ); ref = next; } pdaRun->tokenList = 0; @@ -1156,8 +1156,8 @@ void colm_pda_clear( program_t *prg, tree_t **sp, struct pda_run *pdaRun ) kid_t *btp = pdaRun->btPoint; while ( btp != 0 ) { kid_t *next = btp->next; - treeDownref( prg, sp, btp->tree ); - kidFree( prg, (kid_t*)btp ); + colm_tree_downref( prg, sp, btp->tree ); + kid_free( prg, (kid_t*)btp ); btp = next; } pdaRun->btPoint = 0; @@ -1174,7 +1174,7 @@ void colm_pda_clear( program_t *prg, tree_t **sp, struct pda_run *pdaRun ) colm_rt_code_vect_empty( &pdaRun->reverseCode ); colm_rt_code_vect_empty( &pdaRun->rcodeCollect ); - treeDownref( prg, sp, pdaRun->parseErrorText ); + colm_tree_downref( prg, sp, pdaRun->parseErrorText ); } void colm_pda_init( program_t *prg, struct pda_run *pdaRun, struct pda_tables *tables, @@ -1193,12 +1193,12 @@ void colm_pda_init( program_t *prg, struct pda_run *pdaRun, struct pda_tables *t /* FIXME: need the right one here. */ pdaRun->pda_cs = prg->rtd->startStates[pdaRun->parserId]; - kid_t *sentinal = kidAllocate( prg ); - sentinal->tree = treeAllocate( prg ); + kid_t *sentinal = kid_allocate( prg ); + sentinal->tree = tree_allocate( prg ); sentinal->tree->refs = 1; /* Init the element allocation variables. */ - pdaRun->stackTop = parseTreeAllocate( prg ); + pdaRun->stackTop = parse_tree_allocate( prg ); pdaRun->stackTop->state = -1; pdaRun->stackTop->shadow = sentinal; @@ -1516,9 +1516,9 @@ again: if ( pdaRun->lel->id < prg->rtd->firstNonTermId ) { attach_left_ignore( prg, sp, pdaRun, pdaRun->lel ); - ref_t *ref = (ref_t*)kidAllocate( prg ); + ref_t *ref = (ref_t*)kid_allocate( prg ); ref->kid = pdaRun->lel->shadow; - //treeUpref( pdaRun->tree ); + //colm_tree_upref( pdaRun->tree ); ref->next = pdaRun->tokenList; pdaRun->tokenList = ref; } @@ -1571,13 +1571,13 @@ again: if ( pdaRun->parseInput != 0 ) pdaRun->parseInput->causeReduce += 1; - kid_t *value = kidAllocate( prg ); - value->tree = treeAllocate( prg ); + kid_t *value = kid_allocate( prg ); + value->tree = tree_allocate( prg ); value->tree->refs = 1; value->tree->id = prg->rtd->prodInfo[pdaRun->reduction].lhsId; value->tree->prod_num = prg->rtd->prodInfo[pdaRun->reduction].prodNum; - pdaRun->redLel = parseTreeAllocate( prg ); + pdaRun->redLel = parse_tree_allocate( prg ); pdaRun->redLel->id = prg->rtd->prodInfo[pdaRun->reduction].lhsId; pdaRun->redLel->next = 0; pdaRun->redLel->causeReduce = 0; @@ -1663,11 +1663,11 @@ again: // // /* Make it into a parse tree. */ // tree_t *newPt = prepParseTree( prg, sp, pdaRun->redLel->tree ); -// treeDownref( prg, sp, pdaRun->redLel->tree ); +// colm_tree_downref( prg, sp, pdaRun->redLel->tree ); // // /* Copy it in. */ // pdaRun->redLel->tree = newPt; -// treeUpref( pdaRun->redLel->tree ); +// colm_tree_upref( pdaRun->redLel->tree ); /* Add the restore instruct. */ append_code_val( &pdaRun->rcodeCollect, IN_RESTORE_LHS ); @@ -1676,7 +1676,7 @@ again: } else { /* Not changed. Done with parsed. */ - treeDownref( prg, sp, pdaRun->parsed ); + colm_tree_downref( prg, sp, pdaRun->parsed ); } pdaRun->parsed = 0; } @@ -1876,9 +1876,9 @@ parseError: } /* Free the reduced item. */ - treeDownref( prg, sp, pdaRun->undoLel->shadow->tree ); - kidFree( prg, pdaRun->undoLel->shadow ); - parseTreeFree( prg, pdaRun->undoLel ); + colm_tree_downref( prg, sp, pdaRun->undoLel->shadow->tree ); + kid_free( prg, pdaRun->undoLel->shadow ); + parse_tree_free( prg, pdaRun->undoLel ); /* If the stacktop had right ignore attached, detach now. */ if ( pdaRun->stackTop->flags & PF_RIGHT_IL_ATTACHED ) @@ -1901,9 +1901,9 @@ parseError: send_back_ignore( prg, sp, pdaRun, is, ignore ); - treeDownref( prg, sp, ignore->shadow->tree ); - kidFree( prg, ignore->shadow ); - parseTreeFree( prg, ignore ); + colm_tree_downref( prg, sp, ignore->shadow->tree ); + kid_free( prg, ignore->shadow ); + parse_tree_free( prg, ignore ); } else { if ( pdaRun->shiftCount == pdaRun->commitShiftCount ) { @@ -1940,7 +1940,7 @@ parseError: /* Pop from the token list. */ ref_t *ref = pdaRun->tokenList; pdaRun->tokenList = ref->next; - kidFree( prg, (kid_t*)ref ); + kid_free( prg, (kid_t*)ref ); assert( pdaRun->accumIgnore == 0 ); detach_left_ignore( prg, sp, pdaRun, pdaRun->parseInput ); @@ -2304,7 +2304,7 @@ long colm_parse_finish( tree_t **result, program_t *prg, tree_t **sp, commit_full( prg, sp, pdaRun, 0 ); tree_t *tree = get_parsed_root( pdaRun, pdaRun->stopTarget > 0 ); - treeUpref( tree ); + colm_tree_upref( tree ); *result = tree; @@ -26,7 +26,7 @@ #include <colm/pool.h> #include <colm/debug.h> -void initPoolAlloc( struct pool_alloc *poolAlloc, int sizeofT ) +void init_pool_alloc( struct pool_alloc *poolAlloc, int sizeofT ) { poolAlloc->head = 0; poolAlloc->nextel = FRESH_BLOCK; @@ -34,7 +34,7 @@ void initPoolAlloc( struct pool_alloc *poolAlloc, int sizeofT ) poolAlloc->sizeofT = sizeofT; } -void *poolAllocAllocate( struct pool_alloc *poolAlloc ) +static void *pool_alloc_allocate( struct pool_alloc *poolAlloc ) { //debug( REALM_POOL, "pool allocation\n" ); @@ -65,7 +65,7 @@ void *poolAllocAllocate( struct pool_alloc *poolAlloc ) #endif } -void poolAllocFree( struct pool_alloc *poolAlloc, void *el ) +void pool_alloc_free( struct pool_alloc *poolAlloc, void *el ) { #if 0 /* Some sanity checking. Best not to normally run with this on. */ @@ -85,7 +85,7 @@ void poolAllocFree( struct pool_alloc *poolAlloc, void *el ) #endif } -void poolAllocClear( struct pool_alloc *poolAlloc ) +void pool_alloc_clear( struct pool_alloc *poolAlloc ) { struct pool_block *block = poolAlloc->head; while ( block != 0 ) { @@ -100,7 +100,7 @@ void poolAllocClear( struct pool_alloc *poolAlloc ) poolAlloc->pool = 0; } -long poolAllocNumLost( struct pool_alloc *poolAlloc ) +long pool_alloc_num_lost( struct pool_alloc *poolAlloc ) { /* Count the number of items allocated. */ long lost = 0; @@ -128,186 +128,118 @@ long poolAllocNumLost( struct pool_alloc *poolAlloc ) * kid_t */ -kid_t *kidAllocate( program_t *prg ) +kid_t *kid_allocate( program_t *prg ) { - return (kid_t*) poolAllocAllocate( &prg->kidPool ); + return (kid_t*) pool_alloc_allocate( &prg->kidPool ); } -void kidFree( program_t *prg, kid_t *el ) +void kid_free( program_t *prg, kid_t *el ) { - poolAllocFree( &prg->kidPool, el ); + pool_alloc_free( &prg->kidPool, el ); } -void kidClear( program_t *prg ) +void kid_clear( program_t *prg ) { - poolAllocClear( &prg->kidPool ); + pool_alloc_clear( &prg->kidPool ); } -long kidNumLost( program_t *prg ) +long kid_num_lost( program_t *prg ) { - return poolAllocNumLost( &prg->kidPool ); + return pool_alloc_num_lost( &prg->kidPool ); } /* * tree_t */ -tree_t *treeAllocate( program_t *prg ) +tree_t *tree_allocate( program_t *prg ) { - return (tree_t*) poolAllocAllocate( &prg->treePool ); + return (tree_t*) pool_alloc_allocate( &prg->treePool ); } -void treeFree( program_t *prg, tree_t *el ) +void tree_free( program_t *prg, tree_t *el ) { - poolAllocFree( &prg->treePool, el ); + pool_alloc_free( &prg->treePool, el ); } -void treeClear( program_t *prg ) +void tree_clear( program_t *prg ) { - poolAllocClear( &prg->treePool ); + pool_alloc_clear( &prg->treePool ); } -long treeNumLost( program_t *prg ) +long tree_num_lost( program_t *prg ) { - return poolAllocNumLost( &prg->treePool ); + return pool_alloc_num_lost( &prg->treePool ); } /* * parse_tree_t */ -parse_tree_t *parseTreeAllocate( program_t *prg ) +parse_tree_t *parse_tree_allocate( program_t *prg ) { - return (parse_tree_t*) poolAllocAllocate( &prg->parseTreePool ); + return (parse_tree_t*) pool_alloc_allocate( &prg->parseTreePool ); } -void parseTreeFree( program_t *prg, parse_tree_t *el ) +void parse_tree_free( program_t *prg, parse_tree_t *el ) { - poolAllocFree( &prg->parseTreePool, el ); + pool_alloc_free( &prg->parseTreePool, el ); } -void parseTreeClear( program_t *prg ) +void parse_tree_clear( program_t *prg ) { - poolAllocClear( &prg->parseTreePool ); + pool_alloc_clear( &prg->parseTreePool ); } -long parseTreeNumLost( program_t *prg ) +long parse_tree_num_lost( program_t *prg ) { - return poolAllocNumLost( &prg->parseTreePool ); + return pool_alloc_num_lost( &prg->parseTreePool ); } /* - * list_el_t - */ - -#if 0 -list_el_t *listElAllocate( program_t *prg ) -{ - return (list_el_t*) poolAllocAllocate( &prg->listElPool ); -} - -void listElFree( program_t *prg, list_el_t *el ) -{ - //poolAllocFree( &prg->listElPool, el ); -} - -void listElClear( program_t *prg ) -{ - poolAllocClear( &prg->listElPool ); -} - -long listElNumLost( program_t *prg ) -{ - return poolAllocNumLost( &prg->listElPool ); -} -#endif - -/* - * map_el_t - */ - -#if 0 -map_el_t *mapElAllocate( program_t *prg ) -{ - return (map_el_t*) poolAllocAllocate( &prg->mapElPool ); -} - -void mapElFree( program_t *prg, map_el_t *el ) -{ - poolAllocFree( &prg->mapElPool, el ); -} - -void mapElClear( program_t *prg ) -{ - poolAllocClear( &prg->mapElPool ); -} - -long mapElNumLost( program_t *prg ) -{ - return poolAllocNumLost( &prg->mapElPool ); -} -#endif - -/* * head_t */ -head_t *headAllocate( program_t *prg ) +head_t *head_allocate( program_t *prg ) { - return (head_t*) poolAllocAllocate( &prg->headPool ); + return (head_t*) pool_alloc_allocate( &prg->headPool ); } -void headFree( program_t *prg, head_t *el ) +void head_free( program_t *prg, head_t *el ) { - poolAllocFree( &prg->headPool, el ); + pool_alloc_free( &prg->headPool, el ); } -void headClear( program_t *prg ) +void head_clear( program_t *prg ) { - poolAllocClear( &prg->headPool ); + pool_alloc_clear( &prg->headPool ); } -long headNumLost( program_t *prg ) +long head_num_lost( program_t *prg ) { - return poolAllocNumLost( &prg->headPool ); + return pool_alloc_num_lost( &prg->headPool ); } /* * location_t */ -location_t *locationAllocate( program_t *prg ) +location_t *location_allocate( program_t *prg ) { - return (location_t*) poolAllocAllocate( &prg->locationPool ); + return (location_t*) pool_alloc_allocate( &prg->locationPool ); } -void locationFree( program_t *prg, location_t *el ) +void location_free( program_t *prg, location_t *el ) { - poolAllocFree( &prg->locationPool, el ); + pool_alloc_free( &prg->locationPool, el ); } -void locationClear( program_t *prg ) +void location_clear( program_t *prg ) { - poolAllocClear( &prg->locationPool ); + pool_alloc_clear( &prg->locationPool ); } -long locationNumLost( program_t *prg ) +long location_num_lost( program_t *prg ) { - return poolAllocNumLost( &prg->locationPool ); + return pool_alloc_num_lost( &prg->locationPool ); } - -/* - * stream_t - */ - -#if 0 -stream_t *streamAllocate( program_t *prg ) -{ - return (stream_t*)mapElAllocate( prg ); -} - -void streamFree( program_t *prg, stream_t *stream ) -{ - mapElFree( prg, (map_el_t*)stream ); -} -#endif @@ -33,48 +33,32 @@ extern "C" { #endif -void initPoolAlloc( struct pool_alloc *poolAlloc, int sizeofT ); +void init_pool_alloc( struct pool_alloc *poolAlloc, int sizeofT ); -kid_t *kidAllocate( program_t *prg ); -void kidFree( program_t *prg, kid_t *el ); -void kidClear( program_t *prg ); -long kidNumLost( program_t *prg ); +kid_t *kid_allocate( program_t *prg ); +void kid_free( program_t *prg, kid_t *el ); +void kid_clear( program_t *prg ); +long kid_num_lost( program_t *prg ); -tree_t *treeAllocate( program_t *prg ); -void treeFree( program_t *prg, tree_t *el ); -void treeClear( program_t *prg ); -long treeNumLost( program_t *prg ); +tree_t *tree_allocate( program_t *prg ); +void tree_free( program_t *prg, tree_t *el ); +void tree_clear( program_t *prg ); +long tree_num_lost( program_t *prg ); -parse_tree_t *parseTreeAllocate( program_t *prg ); +parse_tree_t *parse_tree_allocate( program_t *prg ); void parseTreeFree( program_t *prg, parse_tree_t *el ); -void parseTreeClear( program_t *prg ); -long parseTreeNumLost( program_t *prg ); - -list_el_t *listElAllocate( program_t *prg ); -void listElFree( program_t *prg, list_el_t *el ); -void listElClear( program_t *prg ); -long listElNumLost( program_t *prg ); - -map_el_t *mapElAllocate( program_t *prg ); -void mapElFree( program_t *prg, map_el_t *el ); -void mapElClear( program_t *prg ); -long mapElNumLost( program_t *prg ); - -head_t *headAllocate( program_t *prg ); -void headFree( program_t *prg, head_t *el ); -void headClear( program_t *prg ); -long headNumLost( program_t *prg ); - -location_t *locationAllocate( program_t *prg ); -void locationFree( program_t *prg, location_t *el ); -void locationClear( program_t *prg ); -long locationNumLost( program_t *prg ); - -stream_t *streamAllocate( program_t *prg ); -void streamFree( program_t *prg, stream_t *stream ); - -/* Wrong place. */ -struct tree_pair mapRemove( program_t *prg, map_t *map, tree_t *key ); +void parse_tree_clear( program_t *prg ); +long parse_tree_num_lost( program_t *prg ); + +head_t *head_allocate( program_t *prg ); +void head_free( program_t *prg, head_t *el ); +void head_clear( program_t *prg ); +long head_num_lost( program_t *prg ); + +location_t *location_allocate( program_t *prg ); +void location_free( program_t *prg, location_t *el ); +void location_clear( program_t *prg ); +long location_num_lost( program_t *prg ); #ifdef __cplusplus } diff --git a/src/program.c b/src/program.c index b3374ef4..18064548 100644 --- a/src/program.c +++ b/src/program.c @@ -179,11 +179,11 @@ program_t *colm_new_program( struct colm_sections *rtd ) prg->rtd = rtd; prg->ctxDepParsing = 1; - initPoolAlloc( &prg->kidPool, sizeof(kid_t) ); - initPoolAlloc( &prg->treePool, sizeof(tree_t) ); - initPoolAlloc( &prg->parseTreePool, sizeof(parse_tree_t) ); - initPoolAlloc( &prg->headPool, sizeof(head_t) ); - initPoolAlloc( &prg->locationPool, sizeof(location_t) ); + init_pool_alloc( &prg->kidPool, sizeof(kid_t) ); + init_pool_alloc( &prg->treePool, sizeof(tree_t) ); + init_pool_alloc( &prg->parseTreePool, sizeof(parse_tree_t) ); + init_pool_alloc( &prg->headPool, sizeof(head_t) ); + init_pool_alloc( &prg->locationPool, sizeof(location_t) ); prg->trueVal = (tree_t*) 1; prg->falseVal = (tree_t*) 0; @@ -231,17 +231,17 @@ int colm_delete_program( program_t *prg ) tree_t **sp = prg->stackRoot; int exitStatus = prg->exitStatus; - treeDownref( prg, sp, prg->returnVal ); + colm_tree_downref( prg, sp, prg->returnVal ); colm_clear_heap( prg, sp ); - treeDownref( prg, sp, prg->error ); + colm_tree_downref( prg, sp, prg->error ); #if DEBUG - long kidLost = kidNumLost( prg ); - long treeLost = treeNumLost( prg ); - long parseTreeLost = parseTreeNumLost( prg ); - long headLost = headNumLost( prg ); - long locationLost = locationNumLost( prg ); + long kidLost = kid_num_lost( prg ); + long treeLost = tree_num_lost( prg ); + long parseTreeLost = parse_tree_num_lost( prg ); + long headLost = head_num_lost( prg ); + long locationLost = location_num_lost( prg ); if ( kidLost ) message( "warning: lost kids: %ld\n", kidLost ); @@ -259,11 +259,11 @@ int colm_delete_program( program_t *prg ) message( "warning: lost locations: %ld\n", locationLost ); #endif - kidClear( prg ); - treeClear( prg ); - headClear( prg ); - parseTreeClear( prg ); - locationClear( prg ); + kid_clear( prg ); + tree_clear( prg ); + head_clear( prg ); + parse_tree_clear( prg ); + location_clear( prg ); RunBuf *rb = prg->allocRunBuf; while ( rb != 0 ) { diff --git a/src/string.c b/src/string.c index e7be130b..9003eb1e 100644 --- a/src/string.c +++ b/src/string.c @@ -44,7 +44,7 @@ str_t *string_suffix( program_t *prg, str_t *str, long pos ) tree_t *constructString( program_t *prg, head_t *s ) { - str_t *str = (str_t*) treeAllocate( prg ); + str_t *str = (str_t*) tree_allocate( prg ); str->id = LEL_ID_STR; str->value = s; @@ -69,7 +69,7 @@ head_t *stringCopy( program_t *prg, head_t *head ) result = colm_string_alloc_pointer( prg, head->data, head->length ); if ( head->location != 0 ) { - result->location = locationAllocate( prg ); + result->location = location_allocate( prg ); result->location->name = head->location->name; result->location->line = head->location->line; result->location->column = head->location->column; @@ -83,7 +83,7 @@ void stringFree( program_t *prg, head_t *head ) { if ( head != 0 ) { if ( head->location != 0 ) - locationFree( prg, head->location ); + location_free( prg, head->location ); if ( (char*)(head+1) == head->data ) { /* Full string allocation. */ @@ -91,7 +91,7 @@ void stringFree( program_t *prg, head_t *head ) } else { /* Just a string head. */ - headFree( prg, head ); + head_free( prg, head ); } } } @@ -146,7 +146,7 @@ head_t *stringAllocFull( program_t *prg, const char *data, long length ) head_t *colm_string_alloc_pointer( program_t *prg, const char *data, long length ) { /* Find the length and allocate the space for the shared string. */ - head_t *head = headAllocate( prg ); + head_t *head = head_allocate( prg ); /* Init the header. */ head->data = data; diff --git a/src/struct.c b/src/struct.c index 702dce75..8beb9e2d 100644 --- a/src/struct.c +++ b/src/struct.c @@ -58,7 +58,7 @@ void colm_struct_delete( program_t *prg, tree_t **sp, struct colm_struct *el ) int i, len = prg->rtd->selInfo[el->id].treesLen; for ( i = 0; i < len; i++ ) { tree_t *tree = colm_struct_get_field( el, tree_t*, t[i] ); - treeDownref( prg, sp, tree ); + colm_tree_downref( prg, sp, tree ); } } free( el ); @@ -73,7 +73,7 @@ void colm_parser_destroy( program_t *prg, tree_t **sp, struct colm_struct *s ) free( parser->pdaRun ); /* Free the result. */ - treeDownref( prg, sp, parser->result ); + colm_tree_downref( prg, sp, parser->result ); } parser_t *colm_parser_new( program_t *prg, struct generic_info *gi ) @@ -103,7 +103,7 @@ void colm_map_destroy( program_t *prg, tree_t **sp, struct colm_struct *s ) map_el_t *el = map->head; while ( el != 0 ) { map_el_t *next = el->next; - treeDownref( prg, sp, el->key ); + colm_tree_downref( prg, sp, el->key ); //mapElFree( prg, el ); el = next; } @@ -45,7 +45,7 @@ kid_t *allocAttrs( program_t *prg, long length ) long i; for ( i = 0; i < length; i++ ) { kid_t *next = cur; - cur = kidAllocate( prg ); + cur = kid_allocate( prg ); cur->next = next; } return cur; @@ -56,7 +56,7 @@ void freeAttrs( program_t *prg, kid_t *attrs ) kid_t *cur = attrs; while ( cur != 0 ) { kid_t *next = cur->next; - kidFree( prg, cur ); + kid_free( prg, cur ); cur = next; } } @@ -65,7 +65,7 @@ void freeKidList( program_t *prg, kid_t *kid ) { while ( kid != 0 ) { kid_t *next = kid->next; - kidFree( prg, kid ); + kid_free( prg, kid ); kid = next; } } @@ -180,7 +180,7 @@ kid_t *kidListConcat( kid_t *list1, kid_t *list2 ) tree_t *colm_construct_pointer( program_t *prg, value_t value ) { - pointer_t *pointer = (pointer_t*) treeAllocate( prg ); + pointer_t *pointer = (pointer_t*) tree_allocate( prg ); pointer->id = LEL_ID_PTR; pointer->value = value; @@ -193,11 +193,11 @@ value_t colm_get_pointer_val( tree_t *ptr ) } -tree_t *constructTerm( program_t *prg, word_t id, head_t *tokdata ) +tree_t *colm_construct_term( program_t *prg, word_t id, head_t *tokdata ) { struct lang_el_info *lelInfo = prg->rtd->lelInfo; - tree_t *tree = treeAllocate( prg ); + tree_t *tree = tree_allocate( prg ); tree->id = id; tree->refs = 0; tree->tokdata = tokdata; @@ -220,12 +220,12 @@ static kid_t *constructIgnoreList( program_t *prg, long ignoreInd ) head_t *ignoreData = colm_string_alloc_pointer( prg, nodes[ignoreInd].data, nodes[ignoreInd].length ); - tree_t *ignTree = treeAllocate( prg ); + tree_t *ignTree = tree_allocate( prg ); ignTree->refs = 1; ignTree->id = nodes[ignoreInd].id; ignTree->tokdata = ignoreData; - kid_t *ignKid = kidAllocate( prg ); + kid_t *ignKid = kid_allocate( prg ); ignKid->tree = ignTree; ignKid->next = 0; @@ -258,9 +258,9 @@ static void insLeftIgnore( program_t *prg, tree_t *tree, tree_t *ignoreList ) assert( ! (tree->flags & AF_LEFT_IGNORE) ); /* Allocate. */ - kid_t *kid = kidAllocate( prg ); + kid_t *kid = kid_allocate( prg ); kid->tree = ignoreList; - treeUpref( ignoreList ); + colm_tree_upref( ignoreList ); /* Attach it. */ kid->next = tree->child; @@ -274,9 +274,9 @@ static void insRightIgnore( program_t *prg, tree_t *tree, tree_t *ignoreList ) assert( ! (tree->flags & AF_RIGHT_IGNORE) ); /* Insert an ignore head in the child list. */ - kid_t *kid = kidAllocate( prg ); + kid_t *kid = kid_allocate( prg ); kid->tree = ignoreList; - treeUpref( ignoreList ); + colm_tree_upref( ignoreList ); /* Attach it. */ if ( tree->flags & AF_LEFT_IGNORE ) { @@ -291,7 +291,7 @@ static void insRightIgnore( program_t *prg, tree_t *tree, tree_t *ignoreList ) tree->flags |= AF_RIGHT_IGNORE; } -tree_t *pushRightIgnore( program_t *prg, tree_t *pushTo, tree_t *rightIgnore ) +tree_t *push_right_ignore( program_t *prg, tree_t *pushTo, tree_t *rightIgnore ) { /* About to alter the data tree. Split first. */ pushTo = splitTree( prg, pushTo ); @@ -306,7 +306,7 @@ tree_t *pushRightIgnore( program_t *prg, tree_t *pushTo, tree_t *rightIgnore ) * upreffed it in insLeftIgnore. */ curIgnore->tree->refs -= 1; curIgnore->tree = rightIgnore; - treeUpref( rightIgnore ); + colm_tree_upref( rightIgnore ); } else { /* Attach The ignore list. */ @@ -316,7 +316,7 @@ tree_t *pushRightIgnore( program_t *prg, tree_t *pushTo, tree_t *rightIgnore ) return pushTo; } -tree_t *pushLeftIgnore( program_t *prg, tree_t *pushTo, tree_t *leftIgnore ) +tree_t *push_left_ignore( program_t *prg, tree_t *pushTo, tree_t *leftIgnore ) { pushTo = splitTree( prg, pushTo ); @@ -331,7 +331,7 @@ tree_t *pushLeftIgnore( program_t *prg, tree_t *pushTo, tree_t *leftIgnore ) * upreffed it in insRightIgnore. */ curIgnore->tree->refs -= 1; curIgnore->tree = leftIgnore; - treeUpref( leftIgnore ); + colm_tree_upref( leftIgnore ); } else { /* Attach the ignore list. */ @@ -346,8 +346,8 @@ static void remLeftIgnore( program_t *prg, tree_t **sp, tree_t *tree ) assert( tree->flags & AF_LEFT_IGNORE ); kid_t *next = tree->child->next; - treeDownref( prg, sp, tree->child->tree ); - kidFree( prg, tree->child ); + colm_tree_downref( prg, sp, tree->child->tree ); + kid_free( prg, tree->child ); tree->child = next; tree->flags &= ~AF_LEFT_IGNORE; @@ -359,14 +359,14 @@ static void remRightIgnore( program_t *prg, tree_t **sp, tree_t *tree ) if ( tree->flags & AF_LEFT_IGNORE ) { kid_t *next = tree->child->next->next; - treeDownref( prg, sp, tree->child->next->tree ); - kidFree( prg, tree->child->next ); + colm_tree_downref( prg, sp, tree->child->next->tree ); + kid_free( prg, tree->child->next ); tree->child->next = next; } else { kid_t *next = tree->child->next; - treeDownref( prg, sp, tree->child->tree ); - kidFree( prg, tree->child ); + colm_tree_downref( prg, sp, tree->child->tree ); + kid_free( prg, tree->child ); tree->child = next; } @@ -384,15 +384,15 @@ tree_t *popRightIgnore( program_t *prg, tree_t **sp, tree_t *popFrom, tree_t **r * right ignore. */ kid_t *li = treeLeftIgnoreKid( prg, riKid->tree ); if ( li != 0 ) { - treeUpref( li->tree ); + colm_tree_upref( li->tree ); remLeftIgnore( prg, sp, riKid->tree ); *rightIgnore = riKid->tree; - treeUpref( *rightIgnore ); + colm_tree_upref( *rightIgnore ); riKid->tree = li->tree; } else { *rightIgnore = riKid->tree; - treeUpref( *rightIgnore ); + colm_tree_upref( *rightIgnore ); remRightIgnore( prg, sp, popFrom ); } @@ -410,27 +410,27 @@ tree_t *popLeftIgnore( program_t *prg, tree_t **sp, tree_t *popFrom, tree_t **le * left ignore. */ kid_t *ri = treeRightIgnoreKid( prg, liKid->tree ); if ( ri != 0 ) { - treeUpref( ri->tree ); + colm_tree_upref( ri->tree ); remRightIgnore( prg, sp, liKid->tree ); *leftIgnore = liKid->tree; - treeUpref( *leftIgnore ); + colm_tree_upref( *leftIgnore ); liKid->tree = ri->tree; } else { *leftIgnore = liKid->tree; - treeUpref( *leftIgnore ); + colm_tree_upref( *leftIgnore ); remLeftIgnore( prg, sp, popFrom ); } return popFrom; } -tree_t *constructObject( program_t *prg, kid_t *kid, tree_t **bindings, long langElId ) +tree_t *colm_construct_object( program_t *prg, kid_t *kid, tree_t **bindings, long langElId ) { struct lang_el_info *lelInfo = prg->rtd->lelInfo; tree_t *tree = 0; - tree = treeAllocate( prg ); + tree = tree_allocate( prg ); tree->id = langElId; tree->refs = 1; tree->tokdata = 0; @@ -448,7 +448,7 @@ tree_t *constructObject( program_t *prg, kid_t *kid, tree_t **bindings, long lan /* Returns an uprefed tree. Saves us having to downref and bindings to zero to * return a zero-ref tree. */ -tree_t *constructTree( program_t *prg, kid_t *kid, tree_t **bindings, long pat ) +tree_t *colm_construct_tree( program_t *prg, kid_t *kid, tree_t **bindings, long pat ) { struct pat_cons_node *nodes = prg->rtd->patReplNodes; struct lang_el_info *lelInfo = prg->rtd->lelInfo; @@ -463,11 +463,11 @@ tree_t *constructTree( program_t *prg, kid_t *kid, tree_t **bindings, long pat ) if ( ignore >= 0 ) { kid_t *ignore = constructLeftIgnoreList( prg, pat ); - leftIgnore = treeAllocate( prg ); + leftIgnore = tree_allocate( prg ); leftIgnore->id = LEL_ID_IGNORE; leftIgnore->child = ignore; - tree = pushLeftIgnore( prg, tree, leftIgnore ); + tree = push_left_ignore( prg, tree, leftIgnore ); } ignore = nodes[pat].rightIgnore; @@ -475,15 +475,15 @@ tree_t *constructTree( program_t *prg, kid_t *kid, tree_t **bindings, long pat ) if ( ignore >= 0 ) { kid_t *ignore = constructRightIgnoreList( prg, pat ); - rightIgnore = treeAllocate( prg ); + rightIgnore = tree_allocate( prg ); rightIgnore->id = LEL_ID_IGNORE; rightIgnore->child = ignore; - tree = pushRightIgnore( prg, tree, rightIgnore ); + tree = push_right_ignore( prg, tree, rightIgnore ); } } else { - tree = treeAllocate( prg ); + tree = tree_allocate( prg ); tree->id = nodes[pat].id; tree->refs = 1; tree->tokdata = nodes[pat].length == 0 ? 0 : @@ -502,12 +502,12 @@ tree_t *constructTree( program_t *prg, kid_t *kid, tree_t **bindings, long pat ) /* Right first, then left. */ kid_t *ignore = constructRightIgnoreList( prg, pat ); if ( ignore != 0 ) { - tree_t *ignoreList = treeAllocate( prg ); + tree_t *ignoreList = tree_allocate( prg ); ignoreList->id = LEL_ID_IGNORE; ignoreList->refs = 1; ignoreList->child = ignore; - kid_t *ignoreHead = kidAllocate( prg ); + kid_t *ignoreHead = kid_allocate( prg ); ignoreHead->tree = ignoreList; ignoreHead->next = tree->child; tree->child = ignoreHead; @@ -517,12 +517,12 @@ tree_t *constructTree( program_t *prg, kid_t *kid, tree_t **bindings, long pat ) ignore = constructLeftIgnoreList( prg, pat ); if ( ignore != 0 ) { - tree_t *ignoreList = treeAllocate( prg ); + tree_t *ignoreList = tree_allocate( prg ); ignoreList->id = LEL_ID_IGNORE; ignoreList->refs = 1; ignoreList->child = ignore; - kid_t *ignoreHead = kidAllocate( prg ); + kid_t *ignoreHead = kid_allocate( prg ); ignoreHead->tree = ignoreList; ignoreHead->next = tree->child; tree->child = ignoreHead; @@ -534,7 +534,7 @@ tree_t *constructTree( program_t *prg, kid_t *kid, tree_t **bindings, long pat ) for ( i = 0; i < lelInfo[tree->id].numCaptureAttr; i++ ) { long ci = pat+1+i; CaptureAttr *ca = prg->rtd->captureAttr + lelInfo[tree->id].captureAttr + i; - tree_t *attr = treeAllocate( prg ); + tree_t *attr = tree_allocate( prg ); attr->id = nodes[ci].id; attr->refs = 1; attr->tokdata = nodes[ci].length == 0 ? 0 : @@ -554,8 +554,8 @@ kid_t *constructKid( program_t *prg, tree_t **bindings, kid_t *prev, long pat ) kid_t *kid = 0; if ( pat != -1 ) { - kid = kidAllocate( prg ); - kid->tree = constructTree( prg, kid, bindings, pat ); + kid = kid_allocate( prg ); + kid->tree = colm_construct_tree( prg, kid, bindings, pat ); /* Recurse down next. */ kid_t *next = constructKid( prg, bindings, @@ -567,7 +567,7 @@ kid_t *constructKid( program_t *prg, tree_t **bindings, kid_t *prev, long pat ) return kid; } -tree_t *constructToken( program_t *prg, tree_t **args, long nargs ) +tree_t *colm_construct_token( program_t *prg, tree_t **args, long nargs ) { value_t idInt = (value_t)args[0]; str_t *textStr = (str_t*)args[1]; @@ -579,7 +579,7 @@ tree_t *constructToken( program_t *prg, tree_t **args, long nargs ) tree_t *tree; if ( lelInfo[id].ignore ) { - tree = treeAllocate( prg ); + tree = tree_allocate( prg ); tree->refs = 1; tree->id = id; tree->tokdata = tokdata; @@ -590,7 +590,7 @@ tree_t *constructToken( program_t *prg, tree_t **args, long nargs ) kid_t *attrs = allocAttrs( prg, objectLength ); - tree = treeAllocate( prg ); + tree = tree_allocate( prg ); tree->id = id; tree->refs = 1; tree->tokdata = tokdata; @@ -600,7 +600,7 @@ tree_t *constructToken( program_t *prg, tree_t **args, long nargs ) long i; for ( i = 2; i < nargs; i++ ) { colm_tree_set_attr( tree, i-2, args[i] ); - treeUpref( colm_get_attr( tree, i-2 ) ); + colm_tree_upref( colm_get_attr( tree, i-2 ) ); } } return tree; @@ -612,7 +612,7 @@ tree_t *castTree( program_t *prg, int langElId, tree_t *tree ) /* Need to keep a lookout for next down. If * copying it, return the copy. */ - tree_t *newTree = treeAllocate( prg ); + tree_t *newTree = tree_allocate( prg ); newTree->id = langElId; newTree->tokdata = stringCopy( prg, tree->tokdata ); @@ -634,7 +634,7 @@ tree_t *castTree( program_t *prg, int langElId, tree_t *tree ) /* Igores. */ while ( ignores-- > 0 ) { - kid_t *newKid = kidAllocate( prg ); + kid_t *newKid = kid_allocate( prg ); newKid->tree = child->tree; newKid->next = 0; @@ -658,7 +658,7 @@ tree_t *castTree( program_t *prg, int langElId, tree_t *tree ) /* Allocate the target type's kids. */ objectLength = lelInfo[langElId].objectLength; while ( objectLength-- > 0 ) { - kid_t *newKid = kidAllocate( prg ); + kid_t *newKid = kid_allocate( prg ); newKid->tree = 0; newKid->next = 0; @@ -674,7 +674,7 @@ tree_t *castTree( program_t *prg, int langElId, tree_t *tree ) /* Copy the source's children. */ while ( child != 0 ) { - kid_t *newKid = kidAllocate( prg ); + kid_t *newKid = kid_allocate( prg ); newKid->tree = child->tree; newKid->next = 0; @@ -700,7 +700,7 @@ tree_t *makeTree( program_t *prg, tree_t **args, long nargs ) long id = (long)idInt; struct lang_el_info *lelInfo = prg->rtd->lelInfo; - tree_t *tree = treeAllocate( prg ); + tree_t *tree = tree_allocate( prg ); tree->id = id; tree->refs = 1; @@ -709,9 +709,9 @@ tree_t *makeTree( program_t *prg, tree_t **args, long nargs ) kid_t *last = 0, *child = 0; for ( id = 1; id < nargs; id++ ) { - kid_t *kid = kidAllocate( prg ); + kid_t *kid = kid_allocate( prg ); kid->tree = args[id]; - treeUpref( kid->tree ); + colm_tree_upref( kid->tree ); if ( last == 0 ) child = kid; @@ -737,10 +737,10 @@ int testFalse( program_t *prg, tree_t *tree ) kid_t *copyIgnoreList( program_t *prg, kid_t *ignoreHeader ) { - kid_t *newHeader = kidAllocate( prg ); + kid_t *newHeader = kid_allocate( prg ); kid_t *last = 0, *ic = (kid_t*)ignoreHeader->tree; while ( ic != 0 ) { - kid_t *newIc = kidAllocate( prg ); + kid_t *newIc = kid_allocate( prg ); newIc->tree = ic->tree; newIc->tree->refs += 1; @@ -762,10 +762,10 @@ kid_t *copyKidList( program_t *prg, kid_t *kidList ) kid_t *newList = 0, *last = 0, *ic = kidList; while ( ic != 0 ) { - kid_t *newIc = kidAllocate( prg ); + kid_t *newIc = kid_allocate( prg ); newIc->tree = ic->tree; - treeUpref( newIc->tree ); + colm_tree_upref( newIc->tree ); /* List pointers. */ if ( last == 0 ) @@ -784,7 +784,7 @@ tree_t *copyRealTree( program_t *prg, tree_t *tree, kid_t *oldNextDown, kid_t ** { /* Need to keep a lookout for next down. If * copying it, return the copy. */ - tree_t *newTree = treeAllocate( prg ); + tree_t *newTree = tree_allocate( prg ); newTree->id = tree->id; newTree->tokdata = stringCopy( prg, tree->tokdata ); @@ -819,7 +819,7 @@ tree_t *copyRealTree( program_t *prg, tree_t *tree, kid_t *oldNextDown, kid_t ** /* Attributes and children. */ while ( child != 0 ) { - kid_t *newKid = kidAllocate( prg ); + kid_t *newKid = kid_allocate( prg ); /* Watch out for next down. */ if ( child == oldNextDown ) @@ -846,7 +846,7 @@ tree_t *copyRealTree( program_t *prg, tree_t *tree, kid_t *oldNextDown, kid_t ** } -tree_t *copyTree( program_t *prg, tree_t *tree, kid_t *oldNextDown, kid_t **newNextDown ) +tree_t *colm_copy_tree( program_t *prg, tree_t *tree, kid_t *oldNextDown, kid_t **newNextDown ) { // struct lang_el_info *lelInfo = prg->rtd->lelInfo; // long genericId = lelInfo[tree->id].genericId; @@ -877,8 +877,8 @@ tree_t *splitTree( program_t *prg, tree_t *tree ) if ( tree->refs > 1 ) { kid_t *oldNextDown = 0, *newNextDown = 0; - tree_t *newTree = copyTree( prg, tree, oldNextDown, &newNextDown ); - treeUpref( newTree ); + tree_t *newTree = colm_copy_tree( prg, tree, oldNextDown, &newNextDown ); + colm_tree_upref( newTree ); /* Downref the original. Don't need to consider freeing because * refs were > 1. */ @@ -909,12 +909,12 @@ free_tree: // case LEL_ID_BOOL: // case LEL_ID_INT: case LEL_ID_PTR: - treeFree( prg, tree ); + tree_free( prg, tree ); break; case LEL_ID_STR: { str_t *str = (str_t*) tree; stringFree( prg, str->value ); - treeFree( prg, tree ); + tree_free( prg, tree ); break; } default: { @@ -926,11 +926,11 @@ free_tree: while ( child != 0 ) { kid_t *next = child->next; vm_push_tree( child->tree ); - kidFree( prg, child ); + kid_free( prg, child ); child = next; } - treeFree( prg, tree ); + tree_free( prg, tree ); break; }} @@ -946,13 +946,13 @@ free_tree: } } -void treeUpref( tree_t *tree ) +void colm_tree_upref( tree_t *tree ) { if ( tree != 0 ) tree->refs += 1; } -void treeDownref( program_t *prg, tree_t **sp, tree_t *tree ) +void colm_tree_downref( program_t *prg, tree_t **sp, tree_t *tree ) { if ( tree != 0 ) { assert( tree->refs > 0 ); @@ -977,16 +977,16 @@ free_tree: case LEL_ID_STR: { str_t *str = (str_t*) tree; stringFree( prg, str->value ); - treeFree( prg, tree ); + tree_free( prg, tree ); break; } // case LEL_ID_BOOL: // case LEL_ID_INT: { -// treeFree( prg, tree ); +// tree_free( prg, tree ); // break; // } case LEL_ID_PTR: { - treeFree( prg, tree ); + tree_free( prg, tree ); break; } // case LEL_ID_STREAM: { @@ -1000,11 +1000,11 @@ free_tree: while ( child != 0 ) { kid_t *next = child->next; vm_push_tree( child->tree ); - kidFree( prg, child ); + kid_free( prg, child ); child = next; } - treeFree( prg, tree ); + tree_free( prg, tree ); break; }} @@ -1128,7 +1128,7 @@ kid_t *treeRightIgnoreKid( program_t *prg, tree_t *tree ) void refSetValue( program_t *prg, tree_t **sp, ref_t *ref, tree_t *v ) { - treeDownref( prg, sp, ref->kid->tree ); + colm_tree_downref( prg, sp, ref->kid->tree ); ref->kid->tree = v; } @@ -1248,7 +1248,7 @@ int matchPattern( tree_t **bindings, program_t *prg, long pat, kid_t *kid, int c } -long cmpTree( program_t *prg, const tree_t *tree1, const tree_t *tree2 ) +long colm_cmp_tree( program_t *prg, const tree_t *tree1, const tree_t *tree2 ) { long cmpres = 0; if ( tree1 == 0 ) { @@ -1297,7 +1297,7 @@ long cmpTree( program_t *prg, const tree_t *tree1, const tree_t *tree2 ) else if ( kid1 != 0 && kid2 == 0 ) return 1; else { - cmpres = cmpTree( prg, kid1->tree, kid2->tree ); + cmpres = colm_cmp_tree( prg, kid1->tree, kid2->tree ); if ( cmpres != 0 ) return cmpres; } @@ -1329,9 +1329,9 @@ void splitRef( program_t *prg, tree_t ***psp, ref_t *fromRef ) kid_t *oldNextKidDown = nextDown != 0 ? nextDown->kid : 0; kid_t *newNextKidDown = 0; - tree_t *newTree = copyTree( prg, ref->kid->tree, + tree_t *newTree = colm_copy_tree( prg, ref->kid->tree, oldNextKidDown, &newNextKidDown ); - treeUpref( newTree ); + colm_tree_upref( newTree ); /* Downref the original. Don't need to consider freeing because * refs were > 1. */ @@ -1709,22 +1709,22 @@ tree_t *treeTrim( struct colm_program *prg, tree_t **sp, tree_t *tree ) debug( prg, REALM_PARSE, "attaching left ignore\n" ); /* Make the ignore list for the left-ignore. */ - tree_t *leftIgnore = treeAllocate( prg ); + tree_t *leftIgnore = tree_allocate( prg ); leftIgnore->id = LEL_ID_IGNORE; leftIgnore->flags |= AF_SUPPRESS_RIGHT; - tree = pushLeftIgnore( prg, tree, leftIgnore ); + tree = push_left_ignore( prg, tree, leftIgnore ); debug( prg, REALM_PARSE, "attaching ignore right\n" ); /* Copy the ignore list first if we need to attach it as a right * ignore. */ tree_t *rightIgnore = 0; - rightIgnore = treeAllocate( prg ); + rightIgnore = tree_allocate( prg ); rightIgnore->id = LEL_ID_IGNORE; rightIgnore->flags |= AF_SUPPRESS_LEFT; - tree = pushRightIgnore( prg, tree, rightIgnore ); + tree = push_right_ignore( prg, tree, rightIgnore ); return tree; } @@ -1798,7 +1798,7 @@ rec_call: if ( visitType == IgnoreData ) { debug( prg, REALM_PRINT, "putting %p on ignore list\n", kid->tree ); - kid_t *newIgnore = kidAllocate( prg ); + kid_t *newIgnore = kid_allocate( prg ); newIgnore->next = leadingIgnore; leadingIgnore = newIgnore; leadingIgnore->tree = kid->tree; @@ -1806,7 +1806,7 @@ rec_call: } if ( visitType == IgnoreWrapper ) { - kid_t *newIgnore = kidAllocate( prg ); + kid_t *newIgnore = kid_allocate( prg ); newIgnore->next = leadingIgnore; leadingIgnore = newIgnore; leadingIgnore->tree = kid->tree; @@ -211,12 +211,12 @@ typedef struct colm_user_iter long searchId; } user_iter_t; -void treeUpref( tree_t *tree ); -void treeDownref( struct colm_program *prg, tree_t **sp, tree_t *tree ); -long cmpTree( struct colm_program *prg, const tree_t *tree1, const tree_t *tree2 ); +void colm_tree_upref( tree_t *tree ); +void colm_tree_downref( struct colm_program *prg, tree_t **sp, tree_t *tree ); +long colm_cmp_tree( struct colm_program *prg, const tree_t *tree1, const tree_t *tree2 ); -tree_t *pushRightIgnore( struct colm_program *prg, tree_t *pushTo, tree_t *rightIgnore ); -tree_t *pushLeftIgnore( struct colm_program *prg, tree_t *pushTo, tree_t *leftIgnore ); +tree_t *push_right_ignore( struct colm_program *prg, tree_t *pushTo, tree_t *rightIgnore ); +tree_t *push_left_ignore( struct colm_program *prg, tree_t *pushTo, tree_t *leftIgnore ); tree_t *popRightIgnore( struct colm_program *prg, tree_t **sp, tree_t *popFrom, tree_t **rightIgnore ); tree_t *popLeftIgnore( struct colm_program *prg, tree_t **sp, @@ -232,12 +232,12 @@ kid_t *treeExtractChild( struct colm_program *prg, tree_t *tree ); kid_t *reverseKidList( kid_t *kid ); tree_t *colm_construct_pointer( struct colm_program *prg, colm_value_t value ); -tree_t *constructTerm( struct colm_program *prg, word_t id, head_t *tokdata ); -tree_t *constructTree( struct colm_program *prg, kid_t *kid, +tree_t *colm_construct_term( struct colm_program *prg, word_t id, head_t *tokdata ); +tree_t *colm_construct_tree( struct colm_program *prg, kid_t *kid, tree_t **bindings, long pat ); -tree_t *constructObject( struct colm_program *prg, kid_t *kid, +tree_t *colm_construct_object( struct colm_program *prg, kid_t *kid, tree_t **bindings, long langElId ); -tree_t *constructToken( struct colm_program *prg, tree_t **args, long nargs ); +tree_t *colm_construct_token( struct colm_program *prg, tree_t **args, long nargs ); int testFalse( struct colm_program *prg, tree_t *tree ); tree_t *makeTree( struct colm_program *prg, tree_t **args, long nargs ); @@ -246,8 +246,8 @@ stream_t *colm_stream_open_file( struct colm_program *prg, tree_t *name, tree_t stream_t *colm_stream_open_fd( struct colm_program *prg, char *name, long fd ); kid_t *copyIgnoreList( struct colm_program *prg, kid_t *ignoreHeader ); kid_t *copyKidList( struct colm_program *prg, kid_t *kidList ); -void streamFree( struct colm_program *prg, stream_t *s ); -tree_t *copyTree( struct colm_program *prg, tree_t *tree, +void colm_stream_free( struct colm_program *prg, stream_t *s ); +tree_t *colm_copy_tree( struct colm_program *prg, tree_t *tree, kid_t *oldNextDown, kid_t **newNextDown ); colm_value_t colm_get_pointer_val( tree_t *pointer ); diff --git a/test/ext1.lm b/test/ext1.lm index 5a645ef4..edafc611 100644 --- a/test/ext1.lm +++ b/test/ext1.lm @@ -23,8 +23,8 @@ str_t *c_alphcount( program_t *prg, tree_t **sp, str_t *a1 ) head_t *h = stringAllocFull( prg, strc, strlen( strc ) ); tree_t *s = constructString( prg, h ); - treeUpref( s ); - treeDownref( prg, sp, a1 ); + colm_tree_upref( s ); + colm_tree_downref( prg, sp, a1 ); return (str_t*)s; } ##### EXP ##### |