diff options
| -rw-r--r-- | src/bytecode.c | 14 | ||||
| -rw-r--r-- | src/bytecode.h | 2 | ||||
| -rw-r--r-- | src/iter.c | 6 | ||||
| -rw-r--r-- | src/synthesis.cc | 2 | ||||
| -rw-r--r-- | src/tree.h | 6 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/bytecode.c b/src/bytecode.c index ed51f8f0..25218cad 100644 --- a/src/bytecode.c +++ b/src/bytecode.c @@ -313,7 +313,7 @@ static void downref_locals( Program *prg, Tree ***psp, debug( prg, REALM_BYTECODE, "local user iter downref: %ld\n", (long)locals[i].offset ); UserIter *uiter = (UserIter*) vm_get_local( exec, locals[i].offset ); - userIterDestroy2( prg, psp, uiter ); + colm_uiter_unwind( prg, psp, uiter ); break; } } @@ -3443,7 +3443,7 @@ again: vm_contiguous( (sizeof(UserIter) / sizeof(Word)) + FR_AA + fi->frameSize ); - UserIter *uiter = uiterCreate( prg, &sp, fi, searchId ); + UserIter *uiter = colm_uiter_create( prg, &sp, fi, searchId ); vm_set_local(exec, field, (SW) uiter); /* This is a setup similar to as a call, only the frame structure @@ -3478,7 +3478,7 @@ again: vm_contiguous( (sizeof(UserIter) / sizeof(Word)) + FR_AA + fi->frameSize ); - UserIter *uiter = uiterCreate( prg, &sp, fi, searchId ); + UserIter *uiter = colm_uiter_create( prg, &sp, fi, searchId ); vm_set_local(exec, field, (SW) uiter); /* This is a setup similar to as a call, only the frame structure @@ -3507,18 +3507,18 @@ again: debug( prg, REALM_BYTECODE, "IN_UITER_DESTROY %hd\n", field ); UserIter *uiter = (UserIter*) vm_get_local(exec, field); - userIterDestroy( prg, &sp, uiter ); + colm_uiter_destroy( prg, &sp, uiter ); break; } - case IN_UITER_DESTROY2: { + case IN_UITER_UNWIND: { short field; read_half( field ); - debug( prg, REALM_BYTECODE, "IN_UITER_DESTROY %hd\n", field ); + debug( prg, REALM_BYTECODE, "IN_UITER_UNWIND %hd\n", field ); UserIter *uiter = (UserIter*) vm_get_local(exec, field); - userIterDestroy2( prg, &sp, uiter ); + colm_uiter_unwind( prg, &sp, uiter ); break; } diff --git a/src/bytecode.h b/src/bytecode.h index 2b4cb5b9..ae5fa72a 100644 --- a/src/bytecode.h +++ b/src/bytecode.h @@ -168,7 +168,7 @@ typedef unsigned long colm_value_t; #define IN_REV_TRITER_PREV_CHILD 0x4c #define IN_UITER_DESTROY 0x4d -#define IN_UITER_DESTROY2 0x71 +#define IN_UITER_UNWIND 0x71 #define IN_UITER_CREATE_WV 0x4e #define IN_UITER_CREATE_WC 0x4f #define IN_UITER_ADVANCE 0x50 @@ -191,7 +191,7 @@ void initUserIter( UserIter *userIter, Tree **stackRoot, long rootSize, } -UserIter *uiterCreate( Program *prg, Tree ***psp, FunctionInfo *fi, long searchId ) +UserIter *colm_uiter_create( Program *prg, Tree ***psp, FunctionInfo *fi, long searchId ) { Tree **sp = *psp; @@ -253,7 +253,7 @@ void revTreeIterDestroy( struct colm_program *prg, Tree ***psp, RevTreeIter *rit } } -void userIterDestroy( Program *prg, Tree ***psp, UserIter *uiter ) +void colm_uiter_destroy( Program *prg, Tree ***psp, UserIter *uiter ) { if ( uiter != 0 && (int)uiter->type != 0 ) { Tree **sp = *psp; @@ -272,7 +272,7 @@ void userIterDestroy( Program *prg, Tree ***psp, UserIter *uiter ) } } -void userIterDestroy2( Program *prg, Tree ***psp, UserIter *uiter ) +void colm_uiter_unwind( Program *prg, Tree ***psp, UserIter *uiter ) { if ( uiter != 0 && (int)uiter->type != 0 ) { Tree **sp = *psp; diff --git a/src/synthesis.cc b/src/synthesis.cc index 7210d2ff..8285957d 100644 --- a/src/synthesis.cc +++ b/src/synthesis.cc @@ -2206,7 +2206,7 @@ void LangStmt::compileForIterBody( Compiler *pd, pd->unwindCode.insertHalf( 0, objField->offset ); int c = objField->iterImpl->inDestroy; if ( c == IN_UITER_DESTROY ) - c = IN_UITER_DESTROY2; + c = IN_UITER_UNWIND; pd->unwindCode.insert( 0, c ); //objField->iterImpl->inDestroy ); /* Compile the contents. */ @@ -322,7 +322,7 @@ void printXmlStdout( struct colm_program *prg, Tree **sp, * Iterators. */ -UserIter *uiterCreate( struct colm_program *prg, Tree ***psp, +UserIter *colm_uiter_create( struct colm_program *prg, Tree ***psp, struct _FunctionInfo *fi, long searchId ); void uiterInit( struct colm_program *prg, Tree **sp, UserIter *uiter, struct _FunctionInfo *fi, int revertOn ); @@ -336,8 +336,8 @@ void initUserIter( UserIter *userIter, Tree **stackRoot, long rootSize, void treeIterDestroy( struct colm_program *prg, Tree ***psp, TreeIter *iter ); void revTreeIterDestroy( struct colm_program *prg, Tree ***psp, RevTreeIter *iter ); -void userIterDestroy( struct colm_program *prg, Tree ***psp, UserIter *uiter ); -void userIterDestroy2( struct colm_program *prg, Tree ***psp, UserIter *uiter ); +void colm_uiter_destroy( struct colm_program *prg, Tree ***psp, UserIter *uiter ); +void colm_uiter_unwind( struct colm_program *prg, Tree ***psp, UserIter *uiter ); Tree *castTree( struct colm_program *prg, int langElId, Tree *tree ); StreamImpl *streamToImpl( Stream *ptr ); |