Changeset 25739

Timestamp:

12/03/08 11:23:47 (4 years ago)

Author:

fujidig

Message:

* [25644] の修正がだいぶ間違っていたので修正（変数の型と右辺値の型をチェックしても意味がない；一次元のとき配列を拡張していなかった）
* StructArray#newmod? で expand メソッドを使うまでもなさそうだったので修正

Location:

lang/javascript/hsp-on-js/trunk/src

Files:

• evaluator.js (modified) (2 diffs)
• struct-array.js (modified) (1 diff)

lang/javascript/hsp-on-js/trunk/src/evaluator.js

@@ -177 +177 @@
                                 }
                         } else {
+                                // 比較演算は必ず int 型の値が返ってくることに依存
                                 push('var variable = '+variableExpr+';');
                                 if(indicesCount == 0) {
-                                        push('if(variable.value.getType() != arg.getType()) variable.reset(arg.getType());');
+                                        push('if(variable.value.getType() != '+VarType.INT+') variable.reset('+VarType.INT+');');
                                         push('variable.value.assign(0, variable.value.at(0).'+operateMethodNames[calcCode]+'(arg));');
                                 } else if(indicesCount == 1) {
                                         push('var offset = self.scanArg(stack.pop(), "i").toIntValue()._value;');
-                                        push('if(variable.value.getType() != arg.getType()) {');
+                                        push('if(variable.value.getType() != '+VarType.INT+') {');
                                         push('    if(offset == 0) {');
-                                        push('        variable.reset(arg.getType());');
+                                        push('        variable.reset('+VarType.INT+');');
                                         push('    } else {');
                                         push('        throw new HSPError(ErrorCode.INVALID_ARRAYSTORE);');
                                         push('    }');
                                         push('}');
+                                        push('variable.value.expand1D(offset);');
                                         push('variable.value.assign(offset, variable.value.at(offset).'+operateMethodNames[calcCode]+'(arg));');
                                 } else {
@@ -197 +199 @@
                                         push('array.expand(indices);');
                                         push('var offset = array.getOffset(indices);');
-                                        push('if(array.getType() != arg.getType()) {');
+                                        push('if(array.getType() != '+VarType.INT+') {');
                                         push('    if(offset == 0) {');
-                                        push('        variable.reset(arg.getType());');
+                                        push('        variable.reset('+VarType.INT+');');
                                         push('        array = variable.value;');
                                         push('        array.expand(indices);');

lang/javascript/hsp-on-js/trunk/src/struct-array.js

@@ -48 +48 @@
                         }
                 }
-                if(index == len) this.expand([len]);
+                if(index == len) ++ this.l0;
                 this.searchFrom = index + 1;
                 var members = [];