Changeset 21095 for lang/javascript

Timestamp:

10/11/08 02:20:13 (3 months ago)

Author:

fujidig

Message:

* noteload を実装。
* bloadを使っているサンプルを noteload を使うものに修正。

Location:

lang/javascript/hsp-on-js/trunk

Files:

• samples.html (modified) (2 diffs)
• src/builtin-funcs.js (modified) (2 diffs)
• src/evaluator.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.4.js" charset="utf-8"></script>
+<script type="text/javascript" src="hsp-on-js-core-0.0.5.js" charset="utf-8"></script>
 <script type="text/javascript">
 HSPonJS.emptyFunction = function(){};
@@ -319 +319 @@
 <div>
 <textarea cols="100" rows="10">
-sdim buf, 10000
-bload "samples.html", buf // この HTML ファイル自身の内容を取得
+notesel buf
+noteload "samples.html" // この HTML ファイル自身の内容を取得
 ins = instr(buf, 0, "&lt;body")
 ins2 = instr(buf, ins, "&lt;h2")

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

@@ -246 +246 @@
                 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); });
+                this.fileRead(path,
+                              function(data) { this.strsize = new IntValue(data.length); },
+                              function() { this.strsize = new IntValue(-1); });
         },
         0x16: function bload(path, v) {
+                // FIXME 第三引数のサイズ、第四引数のオフセットに対応
                 this.scanArgs(arguments, 'sv');
                 path = path.toStrValue()._value;
-                throw new FileReadException(
+                this.fileRead(
                         path,
                         function(data) {
@@ -392 +392 @@
                 var length = val.lineLengthIncludeCR(index);
                 note.splice(index, length, '');
+        },
+        0x25: function noteload(path) {
+                // FIXME 第二引数のサイズ上限に対応
+                this.scanArgs(arguments, 's');
+                path = path.toStrValue()._value;
+                var note = this.getNote();
+                this.fileRead(
+                        path,
+                        function(data) {
+                                data = CP932.encode(data) + "\0";
+                                note.expandByteSize(data.length);
+                                note.setbytes(0, data);
+                        },
+                        function() {
+                                throw new HSPError(ErrorCode.FILE_IO);
+                        });
         },
         0x27: function randomize(seed) {

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

@@ -209 +209 @@
                 }
                 return this.noteStack[this.noteStack.length - 1];
+        },
+        fileRead: function fileRead(path, success, error) {
+                throw new FileReadException(path, success, error);
         },
         getBuiltinFuncName: function getBuiltinFuncName(insn) {