X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=code%2Ftokens.js;h=c6630fa54a7cb98bd9ee0c4c2c71c0ec67540a19;hp=921040d20899bb6bbe814a82d882ae8f9f9dd43b;hb=f6950034eb1c228badf3364375595032a56e3afb;hpb=0a6cb8dd4a9460b13006f75f6a5b84d434aba212 diff --git a/code/tokens.js b/code/tokens.js index 921040d2..c6630fa5 100644 --- a/code/tokens.js +++ b/code/tokens.js @@ -12,8 +12,8 @@ // Comments of the ; type are ignored. // Operators are by default single characters. Multicharacter -// operators can be made by supplying a string of prefix and -// suffix characters. +// operators can be made by supplying a string of multi_start and +// multi_continue characters. // characters. For example, // '<>+-&', '=>&:' // will match any of these: @@ -22,7 +22,7 @@ /*jslint onevar: false */ -String.prototype.tokens = function (prefix, suffix) { +String.prototype.tokens = function (multi_start, multi_continue) { var c; // The current character. var from; // The index of the start of the token. var i = 0; // The index of the current character. @@ -51,13 +51,13 @@ String.prototype.tokens = function (prefix, suffix) { return; } -// If prefix and suffix strings are not provided, supply defaults. +// If multi_start and multi_continue strings are not provided, supply defaults. - if (typeof prefix !== 'string') { - prefix = ''; + if (typeof multi_start !== 'string') { + multi_start = ''; } - if (typeof suffix !== 'string') { - suffix = ''; + if (typeof multi_continue !== 'string') { + multi_continue = ''; } @@ -153,12 +153,12 @@ String.prototype.tokens = function (prefix, suffix) { // multi-char operator. - } else if (prefix.indexOf(c) >= 0) { + } else if (multi_start.indexOf(c) >= 0) { str = c; i += 1; while (i < length) { c = this.charAt(i); - if (suffix.indexOf(c) < 0) { + if (multi_continue.indexOf(c) < 0) { break; } str += c;