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

Timestamp:

10/04/08 04:45:39 (5 years ago)

Author:

fujidig

Message:

* exist, bload を実装。
* ファイル読み込みのサンプルを追加

Location:

lang/javascript/hsp-on-js/trunk

Files:

• samples.html (modified) (9 diffs)
• src/builtin-funcs.js (modified) (2 diffs)
• src/cp932.js (modified) (1 diff)
• src/evaluator.js (modified) (2 diffs)
• src/exception.js (modified) (3 diffs)
• src/hsp-array.js (modified) (1 diff)
• src/int-array.js (modified) (1 diff)
• src/str-array.js (modified) (1 diff)
• src/variable-agent.js (modified) (1 diff)
• src/variable.js (modified) (1 diff)

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

@@ -8 +8 @@
 <title>HSP on JS</title>
 <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.2/jquery.min.js"></script>
-<script type="text/javascript" src="hsp-on-js-core-0.0.1.js" charset="utf-8"></script>
+<script type="text/javascript" src="hsp-on-js-core-0.0.2.js" charset="utf-8"></script>
 <script type="text/javascript">
+function XHRReadURL(url, success, error) {
+        var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject("Microsoft.XMLHTTP");
+        xhr.open("GET", url, true);
+        xhr.onreadystatechange = function(){
+                if(xhr.readyState != 4) return;
+                if(200 <= xhr.status && xhr.status < 300) {
+                        setTimeout(function(){success(xhr)}, 0);
+                } else if(xhr.status) {
+                        setTimeout(function(){error(xhr)}, 0);
+                }
+        };
+        xhr.send(null);
+        return xhr;
+}
+
 with(HSPonJS) {
         Evaluator.prototype.disposeException = function disposeException(e) {
@@ -17 +32 @@
                         msg += this.getBuiltinFuncName(insn)||'';
                         msg += "\n";
-                        msg += '--> '+(e.message||ErrorMessages[e.errcode]);
+                        msg += '--\x3e '+(e.message||ErrorMessages[e.errcode]);
                         alert(msg);
                         return;
@@ -30 +45 @@
                         return;
                 }
+                if(e instanceof FileReadException) {
+                        var self = this;
+                        self.fileReadXHR = XHRReadURL(
+                                e.path,
+                                function(xhr){
+                                        self.fileReadXHR = null;
+                                        self.catchHSPException(function(){ e.success.call(self, xhr.responseText); });
+                                        self.pc ++;
+                                        self.evaluate();
+                                },
+                                function() {
+                                        self.fileReadXHR = null;
+                                        self.catchHSPException(function(){ e.error.call(self); });
+                                        self.pc ++;
+                                        self.evaluate();
+                                });
+                        return;
+                }
                 throw e;
         };
@@ -35 +68 @@
                 if(this.timeoutID != undefined) {
                         clearTimeout(this.timeoutID);
+                }
+                if(this.fileReadXHR) {
+                        this.fileReadXHR.abort();
+                        this.fileReadXHR = null;
                 }
         };
@@ -58 +95 @@
 $(function(){
         var evaluators = [];
+        function quitEvaluator(i) {
+                if(evaluators[i]) {
+                        evaluators[i].quit();
+                        evaluators[i] = null;
+                }
+        }
         $('textarea').each(function(i) {
                 var textarea = this;
@@ -75 +118 @@
                         var script = textarea.value;
                         resultTextarea.value = '';
-                        if(evaluators[i]) {
-                                evaluators[i].quit();
-                                evaluators[i] = null;
-                        }
+                        quitEvaluator(i);
                         $.post('compile.cgi', {script: script}, function(jsonData){
                                 var data = eval('('+jsonData+')');
@@ -89 +129 @@
                                 var evaluator = new HSPonJS.Evaluator(axdata, sequence);
                                 evaluator.resultTextarea = resultTextarea;
-                                if(evaluators[i]) {
-                                        evaluators[i].quit();
-                                        evaluators[i] = null;
-                                }
+                                quitEvaluator(i);
                                 evaluators[i] = evaluator;
                                 resultTextarea.style.display = '';
@@ -100 +137 @@
                 });
                 $(resetButton).click(function(){
-                        if(evaluators[i]) {
-                                evaluators[i].quit();
-                                evaluators[i] = null;
-                        }
+                        quitEvaluator(i);
                         resultTextarea.style.display = 'none';
                         resetButton.style.display = 'none';
@@ -250 +284 @@
     }
     stop</textarea>
+<h2>ファイル読み込み</h2>
+<textarea cols="100" rows="10">
+sdim buf, 10000
+bload "samples.html", buf // この HTML ファイル自身の内容を取得
+ins = instr(buf, 0, "&lt;h1")
+mes strmid(buf, ins, 100)</textarea>
 <h2>使用ライブラリ</h2>
 <ul>

lang/javascript/hsp-on-js/trunk/src/builtin-funcs.js

@@ -226 +226 @@
                 return new IntValue(this.loopStack[this.loopStack.length - 1].cnt);
         },
+        0x06: function strsize() {
+                return this.strsize;
+        },
         0x07: function looplev() {
                 return new IntValue(this.loopStack.length);
@@ -241 +244 @@
 
 BuiltinFuncs[Token.Type.INTCMD] = {
+        0x11: function exist(path) {
+                this.scanArgs(arguments, 's');
+                path = path.toStrValue()._value;
+                throw new FileReadException(
+                        path,
+                        function(data) { this.strsize = new IntValue(data.length); },
+                        function() { this.strsize = new IntValue(-1); });
+        },
+        0x16: function bload(path, v) {
+                this.scanArgs(arguments, 'sv');
+                path = path.toStrValue()._value;
+                throw new FileReadException(
+                        path,
+                        function(data) {
+                                var size = v.getByteSize();
+                                v.setbytes(0, CP932.encode(data).substr(0, size));
+                        },
+                        function() {
+                                throw new HSPError(ErrorCode.FILE_IO);
+                        });
+        },
         0x1a: function poke(v, offset, val) {
                 this.scanArgs(arguments, 'vNN');

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

@@ -12 +12 @@
 
         encode: function encode(str){
-                return str.replace(/[^\x00-\x7f]/g,function(s){
+                return str.replace(/[^\x00-\xff]/g,function(s){
                         var c=s.charCodeAt(0),m;
                         return 65376<c&&c<65440?String.fromCharCode(c-65216):(c=CP932.Table.indexOf(s))<0?"\x81\x45":String.fromCharCode((m=(c<8272?c:(c=CP932.Table.lastIndexOf(s)))/188|0)<31?m+129:m+193)+String.fromCharCode((c%=188)<63?c+64:c+65)

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

@@ -13 +13 @@
         this.refdval = new DoubleArray();
         this.refstr = new StrArray();
+        this.strsize = new IntValue(0);
         this.random = new VCRandom();
 }
@@ -23 +24 @@
                                 this.dispatch(insn);
                         }
+                } catch(e) {
+                        if(!(e instanceof HSPException)) {
+                                throw e;
+                        }
+                        this.disposeException(e);
+                }
+        },
+        catchHSPException: function catchHSPException(callback) {
+                try {
+                        callback();
                 } catch(e) {
                         if(!(e instanceof HSPException)) {

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

@@ -89 +89 @@
         "外部オブジェクトの呼び出しに失敗しました",         // 39
         "関数の戻り値が設定されていません。",                    // 40
-        "関数を命令として記述しています。¥n(HSP2から関数化された名前を使用している可能性があります)",                    // 41
+        "関数を命令として記述しています。\n(HSP2から関数化された名前を使用している可能性があります)",                    // 41
         "*"
 ];
@@ -102 +102 @@
 }
 WaitException.prototype = new HSPException;
+
+function FileReadException(path, success, error) {
+        this.path = path;
+        this.success = success;
+        this.error = error;
+}
+FileReadException.prototype = new HSPException;
+
 
 function HSPError(errcode, message) {
@@ -116 +124 @@
         HSPonJS.WaitException = WaitException;
         HSPonJS.StopException = StopException;
+        HSPonJS.FileReadException = FileReadException;
         HSPonJS.HSPError = HSPError;
 }

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

@@ -102 +102 @@
                         this.setbyte(offset, bytesOffset + i, buf.charCodeAt(i));
                 }
+        },
+        getByteSize: function getByteSize(offset) {
+                throw new HSPError(ErrorCode.UNSUPPORTED_FUNCTION,
+                                   VarTypeNames[this.getType()]+" 型はメモリ読み込みに対応していません"); 
         }
 };

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

@@ -36 +36 @@
                 value |= (val & 0xff) << (bytesOffset % 4 * 8);
                 this.values[i] = new IntValue(value);
+        },
+        getByteSize: function getByteSize(offset) {
+                return (this.values.length - offset) * 4;
         }
 });

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

@@ -65 +65 @@
                 }
                 this.values[offset] = str.slice(0, bytesOffset) + buf + str.slice(bytesOffset + buf.length);
+        },
+        getByteSize: function getByteSize(offset) {
+                return this.values[offset].length;
         }
 });

lang/javascript/hsp-on-js/trunk/src/variable-agent.js

@@ -95 +95 @@
                 if(offset == null) throw new HSPError(ErrorCode.ARRAY_OVERFLOW);
                 return this.variable.setbytes(offset, bytesOffset, buf);
+        },
+        getByteSize: function getByteSize() {
+                var offset = this.variable.value.getOffset(this.indices);
+                if(offset == null) throw new HSPError(ErrorCode.ARRAY_OVERFLOW);
+                return this.variable.getByteSize(offset);
         }
 };

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

@@ -86 +86 @@
         setbytes: function setbytes(offset, bytesOffset, buf) {
                 return this.value.setbytes(offset, bytesOffset, buf);
+        },
+        getByteSize: function getByteSize(offset) {
+                return this.value.getByteSize(offset);
         }
 };