Author: coke Date: Wed Jul 23 15:24:30 2008 New Revision: 29708 Modified: trunk/languages/tcl/runtime/builtin/append.pir trunk/languages/tcl/runtime/builtin/array.pir trunk/languages/tcl/runtime/builtin/binary.pir trunk/languages/tcl/runtime/builtin/catch.pir trunk/languages/tcl/runtime/builtin/dict.pir trunk/languages/tcl/runtime/builtin/file.pir trunk/languages/tcl/runtime/builtin/foreach.pir trunk/languages/tcl/runtime/builtin/info.pir trunk/languages/tcl/runtime/builtin/lappend.pir trunk/languages/tcl/runtime/builtin/lassign.pir trunk/languages/tcl/runtime/builtin/lset.pir trunk/languages/tcl/runtime/builtin/regexp.pir trunk/languages/tcl/runtime/builtin/regsub.pir trunk/languages/tcl/runtime/builtin/scan.pir trunk/languages/tcl/runtime/builtin/unset.pir trunk/languages/tcl/runtime/builtin/upvar.pir trunk/languages/tcl/runtime/builtin/variable.pir trunk/languages/tcl/runtime/variables.pir trunk/languages/tcl/src/builtin/set.tmt trunk/languages/tcl/src/grammar/expr/past2pir.tg trunk/languages/tcl/tools/gen_inline.pl
Log: [tcl] http://code.google.com/p/partcl/issues/detail?id=58 Eliminate some more __foo style sub names Modified: trunk/languages/tcl/runtime/builtin/append.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/append.pir (original) +++ trunk/languages/tcl/runtime/builtin/append.pir Wed Jul 23 15:24:30 2008 @@ -14,7 +14,7 @@ argc = argv .local pmc read - read = get_root_global ['_tcl'], '__read' + read = get_root_global ['_tcl'], 'readVar' .local string value .local int looper @@ -48,7 +48,7 @@ loop_done: .local pmc set - set = get_root_global ['_tcl'], '__set' + set = get_root_global ['_tcl'], 'setVar' .return set(name, value) getter: Modified: trunk/languages/tcl/runtime/builtin/array.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/array.pir (original) +++ trunk/languages/tcl/runtime/builtin/array.pir Wed Jul 23 15:24:30 2008 @@ -53,9 +53,9 @@ null the_array - .local pmc __find_var - __find_var = get_root_global ['_tcl'], '__find_var' - the_array = __find_var(array_name) + .local pmc findVar + findVar = get_root_global ['_tcl'], 'findVar' + the_array = findVar(array_name) if_null the_array, array_no @@ -150,7 +150,7 @@ .local pmc val .local pmc set - set = get_root_global ['_tcl'], '__set' + set = get_root_global ['_tcl'], 'setVar' if_null the_array, new_array # create a new array if no var goto set_loop Modified: trunk/languages/tcl/runtime/builtin/binary.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/binary.pir (original) +++ trunk/languages/tcl/runtime/builtin/binary.pir Wed Jul 23 15:24:30 2008 @@ -72,8 +72,8 @@ .local pmc ret ret = tcl_binary_scan value, formatString - .local pmc __set, variables, values - __set = get_root_global ['_tcl'], '__set' + .local pmc setVar, variables, values + setVar = get_root_global ['_tcl'], 'setVar' variables = new 'Iterator', argv values = new 'Iterator', ret loop: @@ -83,7 +83,7 @@ .local pmc var, value var = shift variables value = shift values - __set(var, value) + setVar(var, value) goto loop end: Modified: trunk/languages/tcl/runtime/builtin/catch.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/catch.pir (original) +++ trunk/languages/tcl/runtime/builtin/catch.pir Wed Jul 23 15:24:30 2008 @@ -43,9 +43,9 @@ # Store the caught value in a - .local pmc __set - __set = get_root_global ['_tcl'], '__set' - __set(varname,code_retval) + .local pmc setVar + setVar = get_root_global ['_tcl'], 'setVar' + setVar(varname,code_retval) handle_retval: # We need to convert the code Modified: trunk/languages/tcl/runtime/builtin/dict.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/dict.pir (original) +++ trunk/languages/tcl/runtime/builtin/dict.pir Wed Jul 23 15:24:30 2008 @@ -68,8 +68,8 @@ if argc < 2 goto bad_args .local pmc read, set - read = get_root_global ['_tcl'], '__read' - set = get_root_global ['_tcl'], '__set' + read = get_root_global ['_tcl'], 'readVar' + set = get_root_global ['_tcl'], 'setVar' .local pmc dictionary, dict_name dict_name = shift argv @@ -276,9 +276,9 @@ script_loop: unless iterator goto end_script_loop check_key = shift iterator - __set(keyVar,check_key) + setVar(keyVar,check_key) check_value = dictionary[check_key] - __set(valueVar,check_value) + setVar(valueVar,check_value) push_eh body_handler $P1 = body_proc() pop_eh @@ -320,7 +320,7 @@ if argc != 3 goto bad_args .local pmc set, script - set = get_root_global ['_tcl'], '__set' + set = get_root_global ['_tcl'], 'setVar' script = get_root_global ['_tcl'], '__script' .local pmc varNames @@ -346,10 +346,10 @@ for_loop: unless iterator goto for_loop_done $P1 = shift iterator - __set(keyVar, $P1) + setVar(keyVar, $P1) $S1 = $P1 $P2 = dictionary[$S1] - __set(valueVar, $P2) + setVar(valueVar, $P2) push_eh loop_handler code() @@ -425,8 +425,8 @@ if argc > 3 goto bad_args .local pmc read, set - read = get_root_global ['_tcl'], '__read' - set = get_root_global ['_tcl'], '__set' + read = get_root_global ['_tcl'], 'readVar' + set = get_root_global ['_tcl'], 'setVar' .local pmc dictionary, dict_name dict_name = shift argv @@ -515,8 +515,8 @@ if argc < 2 goto bad_args .local pmc read, set - read = get_root_global ['_tcl'], '__read' - set = get_root_global ['_tcl'], '__set' + read = get_root_global ['_tcl'], 'readVar' + set = get_root_global ['_tcl'], 'setVar' .local pmc dictionary, dict_name dict_name = shift argv @@ -722,8 +722,8 @@ if argc < 3 goto bad_args .local pmc read, set - read = get_root_global ['_tcl'], '__read' - set = get_root_global ['_tcl'], '__set' + read = get_root_global ['_tcl'], 'readVar' + set = get_root_global ['_tcl'], 'setVar' .local pmc dictionary, dict_name dict_name = shift argv @@ -804,8 +804,8 @@ if argc < 2 goto bad_args .local pmc read, set - read = get_root_global ['_tcl'], '__read' - set = get_root_global ['_tcl'], '__set' + read = get_root_global ['_tcl'], 'readVar' + set = get_root_global ['_tcl'], 'setVar' .local pmc dictionary, dict_name dict_name = shift argv @@ -865,8 +865,8 @@ if $I0 goto bad_args .local pmc read, set - read = get_root_global ['_tcl'], '__read' - set = get_root_global ['_tcl'], '__set' + read = get_root_global ['_tcl'], 'readVar' + set = get_root_global ['_tcl'], 'setVar' .local pmc dictionary, dict_name dict_name = shift argv @@ -898,7 +898,7 @@ $P2 = shift argv push varnames, $P2 $P3 = dictionary[$P1] - __set($P2, $P3) + set($P2, $P3) goto key_loop done_key_loop: # run the body of the script. save the return vaalue. @@ -914,7 +914,7 @@ unless iter1 goto set_loop_done $P1 = shift iter1 $P2 = shift iter2 - $P3 = __read($P2) + $P3 = readVar($P2) dictionary[$P1] = $P3 goto set_loop set_loop_done: @@ -987,8 +987,8 @@ if argc ==0 goto bad_args .local pmc read, set - read = get_root_global ['_tcl'], '__read' - set = get_root_global ['_tcl'], '__set' + read = get_root_global ['_tcl'], 'readVar' + set = get_root_global ['_tcl'], 'setVar' .local pmc dictionary, dict_name dict_name = shift argv @@ -1024,7 +1024,7 @@ unless iterator goto done_alias $P1 = shift iterator $P2 = dictionary[$P1] - __set($P1,$P2) + set($P1,$P2) goto alias_keys done_alias: .local pmc retval @@ -1035,7 +1035,7 @@ update_keys: unless iterator goto done_update $P1 = shift iterator - $P2 = __read($P1) + $P2 = readVar($P1) dictionary[$P1] = $P2 goto update_keys Modified: trunk/languages/tcl/runtime/builtin/file.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/file.pir (original) +++ trunk/languages/tcl/runtime/builtin/file.pir Wed Jul 23 15:24:30 2008 @@ -137,8 +137,8 @@ $P2 = $P1.'stat'(file) pop_eh - .local pmc __set - __set = find_global '__set' + .local pmc setVar + setVar = find_global 'setVar' $P3 = new 'TclArray' $P1 = $P2[8] @@ -172,7 +172,7 @@ $P1 = $P2[4] $P3['uid'] = $P1 - __set(varname, $P3) + setVar(varname, $P3) .return('') Modified: trunk/languages/tcl/runtime/builtin/foreach.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/foreach.pir (original) +++ trunk/languages/tcl/runtime/builtin/foreach.pir Wed Jul 23 15:24:30 2008 @@ -17,10 +17,10 @@ $P0 = getinterp ns = $P0['namespace'; 1] - .local pmc toList, __script, __set + .local pmc toList, __script, setVar toList = get_root_global ['_tcl'], 'toList' __script = get_root_global ['_tcl'], '__script' - __set = get_root_global ['_tcl'], '__set' + setVar = get_root_global ['_tcl'], 'setVar' .local pmc varLists, lists, command varLists = new 'TclList' @@ -90,7 +90,7 @@ value = shift list value = clone value push_eh couldnt_set - __set(varname, value) + setVar(varname, value) pop_eh goto next_variable @@ -98,7 +98,7 @@ value = new 'TclString' value = '' push_eh couldnt_set - __set(varname, value) + setVar(varname, value) pop_eh goto next_variable Modified: trunk/languages/tcl/runtime/builtin/info.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/info.pir (original) +++ trunk/languages/tcl/runtime/builtin/info.pir Wed Jul 23 15:24:30 2008 @@ -183,8 +183,8 @@ argname = argv[1] varname = argv[2] - .local pmc __set - __set = get_root_global ['_tcl'], '__set' + .local pmc setVar + setVar = get_root_global ['_tcl'], 'setVar' .local pmc __namespace __namespace = get_root_global ['_tcl'], '__namespace' @@ -206,7 +206,7 @@ $P3 = $P2[argname] if_null $P3, check_arg push_eh error_on_set - __set(varname, $P3) + setVar(varname, $P3) pop_eh # store in variable @@ -232,7 +232,7 @@ no_default: push_eh error_on_set - __set(varname, '') + setVar(varname, '') pop_eh .return (0) @@ -356,10 +356,10 @@ .local string varname varname = argv[0] - .local pmc __read, found_var - __read = get_root_global ['_tcl'], '__read' + .local pmc readVar, found_var + readVar = get_root_global ['_tcl'], 'readVar' push_eh not_found - found_var = __read(varname) + found_var = readVar(varname) pop_eh .return (1) Modified: trunk/languages/tcl/runtime/builtin/lappend.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/lappend.pir (original) +++ trunk/languages/tcl/runtime/builtin/lappend.pir Wed Jul 23 15:24:30 2008 @@ -19,7 +19,7 @@ cnt = 1 .local pmc read - read = get_root_global ['_tcl'], '__read' + read = get_root_global ['_tcl'], 'readVar' push_eh new_variable value = read(listname) pop_eh @@ -42,7 +42,7 @@ goto loop loop_done: .local pmc set - set = get_root_global ['_tcl'], '__set' + set = get_root_global ['_tcl'], 'setVar' .return set(listname, value) error: Modified: trunk/languages/tcl/runtime/builtin/lassign.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/lassign.pir (original) +++ trunk/languages/tcl/runtime/builtin/lassign.pir Wed Jul 23 15:24:30 2008 @@ -18,7 +18,7 @@ .local string varname .local pmc set, value - set = get_root_global ['_tcl'], '__set' + set = get_root_global ['_tcl'], 'setVar' var_loop: varname = shift argv Modified: trunk/languages/tcl/runtime/builtin/lset.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/lset.pir (original) +++ trunk/languages/tcl/runtime/builtin/lset.pir Wed Jul 23 15:24:30 2008 @@ -17,13 +17,13 @@ value = pop argv dec argc - .local pmc __read, toList, __set - __read = get_root_global ['_tcl'], '__read' + .local pmc readVar, toList, setVar + readVar = get_root_global ['_tcl'], 'readVar' toList = get_root_global ['_tcl'], 'toList' - __set = get_root_global ['_tcl'], '__set' + setVar = get_root_global ['_tcl'], 'setVar' .local pmc retval, list - list = __read(name) + list = readVar(name) list = toList(list) retval = list @@ -71,7 +71,7 @@ done: prev[$I2] = value - __set(name, retval) + setVar(name, retval) .return(retval) out_of_range: @@ -81,7 +81,7 @@ tcl_error 'wrong # args: should be "lset listVar index ?index...? value"' replace: - .return __set(name, value) + .return setVar(name, value) .end # Local Variables: Modified: trunk/languages/tcl/runtime/builtin/regexp.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/regexp.pir (original) +++ trunk/languages/tcl/runtime/builtin/regexp.pir Wed Jul 23 15:24:30 2008 @@ -47,8 +47,8 @@ argc = elements argv unless argc goto done .local string matchStr, matchVar - .local pmc __set - __set = get_root_global [ '_tcl' ], '__set' + .local pmc setVar + setVar = get_root_global [ '_tcl' ], 'setVar' matchVar = shift argv @@ -63,7 +63,7 @@ $I1 -= $I0 matchStr = substr original_string, $I0, $I1 - __set(matchVar, matchStr) + setVar(matchVar, matchStr) matches = match.'get_array'() .local string subMatchStr, subMatchVar @@ -85,7 +85,7 @@ subMatchStr = substr original_string, $I0, $I1 set_it: - __set(subMatchVar,subMatchStr) + setVar(subMatchVar,subMatchStr) next_submatch: goto subMatches @@ -100,7 +100,7 @@ dec $I1 matchList[0] = $I0 matchList[1] = $I1 - __set(matchVar, matchList) + setVar(matchVar, matchList) matches = match.'get_array'() @@ -126,7 +126,7 @@ subMatchList[1] = $I1 set_it_ind: - __set(subMatchVar,subMatchList) + setVar(subMatchVar,subMatchList) next_submatch_ind: goto subMatches_ind_loop Modified: trunk/languages/tcl/runtime/builtin/regsub.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/regsub.pir (original) +++ trunk/languages/tcl/runtime/builtin/regsub.pir Wed Jul 23 15:24:30 2008 @@ -106,11 +106,11 @@ argc = elements argv unless argc goto return_it - .local pmc __set - __set = get_root_global [ '_tcl' ], '__set' + .local pmc setVar + setVar = get_root_global [ '_tcl' ], 'setVar' .local string varName varName = shift argv - __set (varName, original_target) + setVar (varName, original_target) .return(1) # XXX fix this when we support multiple replacements Modified: trunk/languages/tcl/runtime/builtin/scan.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/scan.pir (original) +++ trunk/languages/tcl/runtime/builtin/scan.pir Wed Jul 23 15:24:30 2008 @@ -73,15 +73,15 @@ assign_results: - .local pmc __set - __set = get_root_global ['_tcl'], '__set' + .local pmc setVar + setVar = get_root_global ['_tcl'], 'setVar' $I0 = 0 var_loop: if $I0 >= argc goto var_loop_done $S0 = argv[$I0] $P0 = results[$I0] push_eh bad_var - __set($S0, $P0) + setVar($S0, $P0) pop_eh inc $I0 goto var_loop Modified: trunk/languages/tcl/runtime/builtin/unset.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/unset.pir (original) +++ trunk/languages/tcl/runtime/builtin/unset.pir Wed Jul 23 15:24:30 2008 @@ -29,7 +29,7 @@ flags_done: .local pmc find_var, var - find_var = get_root_global ['_tcl'], '__find_var' + find_var = get_root_global ['_tcl'], 'findVar' .local string name loop: Modified: trunk/languages/tcl/runtime/builtin/upvar.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/upvar.pir (original) +++ trunk/languages/tcl/runtime/builtin/upvar.pir Wed Jul 23 15:24:30 2008 @@ -30,10 +30,10 @@ # for each othervar/myvar pair, created a mapping from - .local pmc __make, __set, __find_var - __make = get_root_global ['_tcl'], '__make' - __set = get_root_global ['_tcl'], '__set' - __find_var = get_root_global ['_tcl'], '__find_var' + .local pmc makeVar, setVar, findVar + makeVar = get_root_global ['_tcl'], 'makeVar' + setVar = get_root_global ['_tcl'], 'setVar' + findVar = get_root_global ['_tcl'], 'findVar' .local int counter, argc argc = argv @@ -49,7 +49,7 @@ new_var = argv[counter] if new_call_level == 0 goto store_var - $P0 = __find_var(new_var, 'depth'=>1) + $P0 = findVar(new_var, 'depth'=>1) if null $P0 goto store_var $S0 = 'variable "' $S0 .= new_var @@ -68,7 +68,7 @@ goto save_chain_loop save_chain_end: - $P1 = __make(old_var, 'depth'=>1) + $P1 = makeVar(old_var, 'depth'=>1) # restore the old level $I0 = 0 Modified: trunk/languages/tcl/runtime/builtin/variable.pir ============================================================================== --- trunk/languages/tcl/runtime/builtin/variable.pir (original) +++ trunk/languages/tcl/runtime/builtin/variable.pir Wed Jul 23 15:24:30 2008 @@ -11,9 +11,9 @@ argc = elements argv if argc == 0 goto bad_args - .local pmc __find_var, __store_var, __namespace - __find_var = get_root_global ['_tcl'], '__find_var' - __store_var = get_root_global ['_tcl'], '__store_var' + .local pmc findVar, storeVar, __namespace + findVar = get_root_global ['_tcl'], 'findVar' + storeVar = get_root_global ['_tcl'], 'storeVar' __namespace = get_root_global ['_tcl'], '__namespace' .local pmc iter, name, value, ns @@ -40,8 +40,8 @@ ns = __namespace(name) $S0 = ns[-1] # store as a lexical *and* a global - __store_var($S0, value) - __store_var(name, value, 'global'=>1) + storeVar($S0, value) + storeVar(name, value, 'global'=>1) goto loop no_value: @@ -49,16 +49,16 @@ $S0 = ns[-1] # if the variable exists, just insert it as a lexical # otherwise, create a new Undef and insert it as both lexical and global - value = __find_var(name, 'global'=>1) + value = findVar(name, 'global'=>1) if null value goto create_new - __store_var($S0, value) + storeVar($S0, value) goto end create_new: value = new 'Undef' # store as a lexical *and* a global - __store_var($S0, value) - __store_var(name, value, 'global'=>1) + storeVar($S0, value) + storeVar(name, value, 'global'=>1) end: .return('') Modified: trunk/languages/tcl/runtime/variables.pir ============================================================================== --- trunk/languages/tcl/runtime/variables.pir (original) +++ trunk/languages/tcl/runtime/variables.pir Wed Jul 23 15:24:30 2008 @@ -1,7 +1,7 @@ .HLL '_Tcl', '' .namespace [] -=head2 _Tcl::__read +=head2 _Tcl::readVar Read a variable from its name. It may be a scalar or an array. @@ -13,7 +13,7 @@ =cut -.sub __read +.sub readVar .param string name .local pmc variable @@ -39,7 +39,7 @@ inc char key = substr name, char, len - variable = __find_var(var) + variable = findVar(var) if null variable goto no_such_variable $I0 = does variable, 'hash' @@ -64,7 +64,7 @@ tcl_error $S0 scalar: - variable = __find_var(name) + variable = findVar(name) if null variable goto no_such_variable $S0 = typeof variable @@ -84,7 +84,7 @@ tcl_error $S0 .end -=head2 _Tcl::__make +=head2 _Tcl::makeVar Read a variable from its name. If it doesn't exist, create it. It may be a scalar or an array. @@ -96,7 +96,7 @@ =cut -.sub __make +.sub makeVar .param string name .param int depth :named('depth') :optional @@ -123,11 +123,11 @@ inc char key = substr name, char, len - variable = __find_var(var, 'depth' => depth) + variable = findVar(var, 'depth' => depth) unless null variable goto check_is_hash variable = new 'TclArray' - variable = __store_var(var, variable, 'depth' => depth) + variable = storeVar(var, variable, 'depth' => depth) check_is_hash: $I0 = does variable, 'hash' @@ -149,17 +149,17 @@ tcl_error $S0 scalar: - variable = __find_var(name, 'depth' => depth) + variable = findVar(name, 'depth' => depth) if null variable goto make_variable .return(variable) make_variable: variable = new 'Undef' - variable = __store_var(name, variable, 'depth' => depth) + variable = storeVar(name, variable, 'depth' => depth) .return(variable) .end -=head2 _Tcl::__set +=head2 _Tcl::setVar Set a variable by its name. It may be a scalar or an array. @@ -170,7 +170,7 @@ =cut -.sub __set +.sub setVar .param string name .param pmc value @@ -206,7 +206,7 @@ .local pmc array null array - array = __find_var(var) + array = findVar(var) if null array goto create_array $I0 = does array, 'hash' @@ -215,7 +215,7 @@ create_array: array = new 'TclArray' - array = __store_var(var, array) + array = storeVar(var, array) set_array: variable = array[key] @@ -236,13 +236,13 @@ tcl_error $S0 scalar: - $P0 = __find_var(name) + $P0 = findVar(name) if null $P0 goto create_scalar $S0 = typeof $P0 if $S0 == 'TclArray' goto cant_set_array create_scalar: - __store_var(name, value) + storeVar(name, value) $P0 = clone value .return($P0) @@ -253,15 +253,15 @@ tcl_error $S0 .end -=head2 _Tcl::__find_var +=head2 _Tcl::findVar -Utility function used by __read and __set. +Utility function used by readVar and setVar. Gets the actual variable from memory and returns it. =cut -.sub __find_var +.sub findVar .param string name .param int isglobal :named('global') :optional .param int depth :named('depth') :optional @@ -349,15 +349,15 @@ .return(value) .end -=head2 _Tcl::__store_var +=head2 _Tcl::storeVar -Utility function used by __read and __set. +Utility function used by readVar and setVar. Sets the actual variable from memory. =cut -.sub __store_var +.sub storeVar .param string name .param pmc value .param int isglobal :named('global') :optional Modified: trunk/languages/tcl/src/builtin/set.tmt ============================================================================== --- trunk/languages/tcl/src/builtin/set.tmt (original) +++ trunk/languages/tcl/src/builtin/set.tmt Wed Jul 23 15:24:30 2008 @@ -3,13 +3,13 @@ if null $newValue goto read_var .local pmc set - set = get_root_global ['_tcl'], '__set' + set = get_root_global ['_tcl'], 'setVar' $R = set($varName, $newValue) goto end read_var: .local pmc read - read = get_root_global ['_tcl'], '__read' + read = get_root_global ['_tcl'], 'readVar' $R = read($varName) end: Modified: trunk/languages/tcl/src/grammar/expr/past2pir.tg ============================================================================== --- trunk/languages/tcl/src/grammar/expr/past2pir.tg (original) +++ trunk/languages/tcl/src/grammar/expr/past2pir.tg Wed Jul 23 15:24:30 2008 @@ -104,9 +104,9 @@ if $I0 goto array pir.emit(<<'END_PIR', ret, name) - .local pmc __read - __read = get_root_global ['_tcl'], '__read' - %0 = __read('%1') + .local pmc readVar + readVar = get_root_global ['_tcl'], 'readVar' + %0 = readVar('%1') END_PIR .return(pir) @@ -118,12 +118,12 @@ pir .= $P0 $S0 = index['ret'] pir.emit(<<'END_PIR', ret, name, $S0) - .local pmc __read - __read = get_root_global ['_tcl'], '__read' + .local pmc readVar + readVar = get_root_global ['_tcl'], 'readVar' $S0 = %2 $S0 = '%1(' . $S0 $S0 = $S0 . ')' - %0 = __read($S0) + %0 = readVar($S0) END_PIR .return(pir) } Modified: trunk/languages/tcl/tools/gen_inline.pl ============================================================================== --- trunk/languages/tcl/tools/gen_inline.pl (original) +++ trunk/languages/tcl/tools/gen_inline.pl Wed Jul 23 15:24:30 2008 @@ -42,7 +42,7 @@ int => 'toInteger', list => 'toList', script => '__script', - var => '__read', + var => 'readVar', ); my $file = open_tmt( shift @ARGV );
