RAPL

Check-in [6ce4803f8a]
Login

Check-in [6ce4803f8a]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:fixes
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6ce4803f8ada23e672d66436f06cba245ccd14bb
User & Date: arnulf 2012-01-05 20:46:24.276
Context
2012-01-05
20:46
fixes check-in: 79642dcce7 user: arnulf tags: trunk
20:46
fixes check-in: 6ce4803f8a user: arnulf tags: trunk
20:45
fixes and beautifying because of problems with vi check-in: e0d57cc5af user: arnulf tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
Changes to rapl_eval_statement.js.
︙︙
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163

164
165
166
167
168
169
170
171
172
173
174
175
176
177
178

   * The returned object has refcount = 0.
   */
  interpolateTokens: function (script, idx, word_tokens, flags) {
    var stmt = this;
    var total_len = 0;
    var i;
    var j;
    var obj_ptr;
    var str;
    var intv;
    var token = script.script_object.tokens;
    var result_ptr;
    var retcode;
    var my_in_quotes = stmt.in_quotes;

    stmt.in_quotes = false;
    intv = new Array();
    /* Compute every token forming the argument
     * in the intv objects vector. */
    j = 0;
    for (i = 0; i < word_tokens; i++) {

//script.dumpToken(i+idx);
      if (script.script_object.tokens[i + idx].token == stmt.TOKEN_COMMENT) {
        continue;
      }
      result_ptr = new Array();
      retcode = stmt.substOneToken(script, idx + i, result_ptr);
      intv[j] = result_ptr[0];
//print("RES!"+result_ptr[0]+"!"+intv+"!");
//script.dumpToken(i+idx);
      switch(retcode) {
      case stmt.OK:
      case stmt.RETURN:
        break;
      case stmt.BREAK:
        if (flags & stmt.SUBST_FLAG) {








|













>







|








143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179

   * The returned object has refcount = 0.
   */
  interpolateTokens: function (script, idx, word_tokens, flags) {
    var stmt = this;
    var total_len = 0;
    var i;
    var j;
    var obj_ptr = null;
    var str;
    var intv;
    var token = script.script_object.tokens;
    var result_ptr;
    var retcode;
    var my_in_quotes = stmt.in_quotes;

    stmt.in_quotes = false;
    intv = new Array();
    /* Compute every token forming the argument
     * in the intv objects vector. */
    j = 0;
    for (i = 0; i < word_tokens; i++) {
//print("IPOL!"+i+"!"+idx+"!");
//script.dumpToken(i+idx);
      if (script.script_object.tokens[i + idx].token == stmt.TOKEN_COMMENT) {
        continue;
      }
      result_ptr = new Array();
      retcode = stmt.substOneToken(script, idx + i, result_ptr);
      intv[j] = result_ptr[0];
//print("RES!"+result_ptr[0]+"!"+intv+"!"+retcode+"!");
//script.dumpToken(i+idx);
      switch(retcode) {
      case stmt.OK:
      case stmt.RETURN:
        break;
      case stmt.BREAK:
        if (flags & stmt.SUBST_FLAG) {
︙︙
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471

            retcode = stmt.interp.command_obj_type.callProcedure(cmd, script.script_object.file_name_obj, line_no, argc, argv);
          } else {
            stmt.interp.cmd_priv_data = cmd.u.native_fcn.privdata;
            retcode = cmd.u.native_fcn.cmd_proc(stmt.interp, argv, cmd);
          }
          cmd.decrCmdRefCount();
        } else {
print("RETC!"+retcode+"!"+argc+"!"+argv+"!");
          /* Call [unknown] */
          retcode = stmt.interp.unknown(argc, argv, script.script_object.file_name_obj, line_no);
        }
      }

//      /* Finished with the command, so decrement ref counts of each argument */
//      j--;








|








458
459
460
461
462
463
464
465
466
467
468
469
470
471
472

            retcode = stmt.interp.command_obj_type.callProcedure(cmd, script.script_object.file_name_obj, line_no, argc, argv);
          } else {
            stmt.interp.cmd_priv_data = cmd.u.native_fcn.privdata;
            retcode = cmd.u.native_fcn.cmd_proc(stmt.interp, argv, cmd);
          }
          cmd.decrCmdRefCount();
        } else {
//print("RETC!"+retcode+"!"+argc+"!"+argv+"!");
          /* Call [unknown] */
          retcode = stmt.interp.unknown(argc, argv, script.script_object.file_name_obj, line_no);
        }
      }

//      /* Finished with the command, so decrement ref counts of each argument */
//      j--;
︙︙