Changeset 25790 for lang/javascript/hsp-on-js

Timestamp:

12/03/08 20:49:43 (5 weeks ago)

Author:

fujidig

Message:

* fixed bug
* JavaScript? エラーが出たとき実行していた instruction の情報を表示するように

Location:

lang/javascript/hsp-on-js/trunk

Files:

• gui-trial.js (modified) (1 diff)
• samples.html (modified) (1 diff)
• src/evaluator.js (modified) (1 diff)

lang/javascript/hsp-on-js/trunk/gui-trial.js

@@ -387 +387 @@
         Evaluator.prototype.disposeException = function disposeException(e) {
                 if(!(e instanceof HSPException)) {
-                        alert('JavaScript Error!\n'+e.name+': '+e.message+'\n'+e.fileName+':'+e.lineNumber);
+                        var insn = this.sequence[this.pc];
+                        var msg = 'JavaScript Error!\n';
+                        msg += e.name+': '+e.message+'\n';
+                        msg += e.fileName+':'+e.lineNumber+'\n';
+                        msg += 'pc = '+this.pc+'\n';
+                        if(insn) {
+                                msg += insn.lineNo+' ('+insn.fileName+') \n';
+                                msg += insn;
+                        }
+                        alert(msg);
                         throw e;
                 }

lang/javascript/hsp-on-js/trunk/samples.html

@@ -42 +42 @@
         Evaluator.prototype.disposeException = function disposeException(e) {
                 if(!(e instanceof HSPException)) {
-                        alert('JavaScript Error!\n'+e.name+': '+e.message+'\n'+e.fileName+':'+e.lineNumber);
+                        var insn = this.sequence[this.pc];
+                        var msg = 'JavaScript Error!\n';
+                        msg += e.name+': '+e.message+'\n';
+                        msg += e.fileName+':'+e.lineNumber+'\n';
+                        msg += 'pc = '+this.pc+'\n';
+                        if(insn) {
+                                msg += insn.lineNo+' ('+insn.fileName+') \n';
+                                msg += insn;
+                        }
+                        alert(msg);
                         throw e;
                 }

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

@@ -592 +592 @@
                                 push('    throw new HSPError(ErrorCode.TYPE_MISMATCH);');
                                 push('}');
-                                push('agent.assign(StructValue.EMPTY);');
+                                push('v.assign(StructValue.EMPTY);');
                                 break;
                         case Instruction.Code.REPEAT: