Changeset 21094

Timestamp:

10/11/08 01:45:28 (5 years ago)

Author:

fujidig

Message:

noteadd, notedel を実装

Location:

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

Files:

• builtin-funcs.js (modified) (2 diffs)
• evaluator.js (modified) (1 diff)
• str-buffer.js (modified) (1 diff)
• str-value.js (modified) (2 diffs)
• t.hsp (modified) (1 diff)

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

@@ -357 +357 @@
                 this.noteStack.push(buf);
         },
+        0x23: function noteadd(line, lineNumber, overwrite) {
+                this.scanArgs(arguments, 'sNN');
+                line = line.toStrValue();
+                lineNumber = lineNumber ? lineNumber.toIntValue()._value : -1;
+                overwrite = (overwrite ? overwrite.toIntValue()._value : 0) != 0;
+                var note = this.getNote();
+                var index = note.getValue().lineIndex(lineNumber);
+                if(index == null) {
+                        if(lineNumber >= 0) return;
+                        var str = note.getValue()._value;
+                        index = str.length;
+                        if(index != 0) {
+                                var c = str.charCodeAt(index - 1);
+                                if(c != 0x0d && c != 0x0a) {
+                                        note.assign(new StrValue(str + "\r\n"));
+                                        index += 2;
+                                }
+                        }
+                }
+                if(!overwrite) {
+                        note.splice(index, 0, line._value + "\r\n");
+                        return;
+                }
+                var length = note.getValue().lineLength(index);
+                note.splice(index, length, line._value);
+        },
+        0x24: function notedel(lineNumber) {
+                this.scanArgs(arguments, 'N');
+                lineNumber = lineNumber ? lineNumber.toIntValue()._value : 0;
+                var note = this.getNote();
+                var val = note.getValue();
+                var index = val.lineIndex(lineNumber);
+                if(index == null) return;
+                var length = val.lineLengthIncludeCR(index);
+                note.splice(index, length, '');
+        },
         0x27: function randomize(seed) {
                 this.scanArgs(arguments, 'N');
@@ -371 +407 @@
                 var str = val._value;
                 var index = val.lineIndex(lineNumber);
-                if(index == null) index = str.length;
+                if(index == null) {
+                        dest.assign(StrValue.EMPTY_STR);
+                        return;
+                }
                 var length = val.lineLength(index);
-                if(length >= 1 && str.charCodeAt(index + length - 1) == 0x0a) {
-                        length --;
-                }
-                if(length >= 1 && str.charCodeAt(index + length - 1) == 0x0d) {
-                        length --;
-                }
                 dest.assign(new StrValue(str.substr(index, length)));
         }

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

@@ -206 +206 @@
         getNote: function getNote() {
                 if(this.noteStack.length == 0) {
-                        throw new HSPError(ErrorCode.ILLEGAL_FUNCTION);
+                        throw new HSPError(ErrorCode.ILLEGAL_FUNCTION, 'ノートパッドが選択されていません');
                 }
                 return this.noteStack[this.noteStack.length - 1];

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

@@ -56 +56 @@
                 if(this._str.length >= size) return;
                 this._str += Utils.strTimes("\0", size - this._str.length);
+        },
+        splice: function splice(index, length, sub) {
+                var str = this._str;
+                this._str = str.slice(0, index) + sub + str.slice(index + length);
+                this._valCache = null;
         }
 };

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

@@ -93 +93 @@
         },
         lineIndex: function lineIndex(lineNumber) {
+                if(lineNumber < 0) return null;
                 var str = this._value;
                 var i = 0;
@@ -112 +113 @@
         lineLength: function lineLength(index) {
                 var str = this._value;
+                return /[\r\n]|$/.exec(str.slice(index)).index;
+        },
+        lineLengthIncludeCR: function lineLengthIncludeCR(index) {
+                var str = this._value;
                 var matched = /\r?\n|\r|$/.exec(str.slice(index));
                 return matched.index + matched[0].length;

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

@@ -1 @@
-a = "abcdefg"
-poke a, 2, "XXX"
-mes a
-mes strsize
+a = "abc\ndefg\nhijkl"
+notesel a
+noteadd "123"
+noteadd "456"
+noteadd "DEFG", 1, 1
+notedel 0
+repeat notemax + 2, -1
+        noteget ln, cnt
+        mes ""+cnt+": <"+ln+">"
+loop