gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 07:17:59 +01:00
Code Issues Projects Releases Wiki Activity

Remove old heredoc parsing cruft from commands.parseCommand.

Browse Source
This commit is contained in:
Doug Kearns
2009-01-03 23:42:14 +11:00
parent 153536799a
commit 0d3d8ce63b
1 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
common/content/commands.js
View File

@@ -148,7 +148,7 @@ Command.prototype = {
* @param {boolean} bang @deprecated Whether this command was
* executed with a trailing !.
* @param {number} count @deprecated Whether this command was
* executed a leading count.
* executed with a leading count.
* @param modifiers Any modifiers to be passed to
* {@link action}
*/
@@ -718,27 +718,18 @@ function Commands() //{{{
return args;
},
// return [null, null, null, null, heredoc_tag || false];
// [count, cmd, special, args] = match;
parseCommand: function (str, tag)
parseCommand: function (str)
{
// remove comments
str.replace(/\s*".*$/, "");
if (tag) // we already have a multiline heredoc construct
{
if (str == tag)
return [null, null, null, null, false];
else
return [null, null, null, str, tag];
}
// 0 - count, 1 - cmd, 2 - special, 3 - args, 4 - heredoc tag
// 0 - count, 1 - cmd, 2 - special, 3 - args
let matches = str.match(/^:*(\d+|%)?([a-zA-Z]+|!)(!)?(?:\s*(.*?))?$/);
//var matches = str.match(/^:*(\d+|%)?([a-zA-Z]+|!)(!)?(?:\s*(.*?)\s*)?$/);
if (!matches)
return [null, null, null, null, null];
let [, count, cmd, special, args, heredoc] = matches;
return [null, null, null, null];
let [, count, cmd, special, args] = matches;
// parse count
if (count)
@@ -746,14 +737,7 @@ function Commands() //{{{
else
count = this.COUNT_NONE;
if (args)
{
tag = args.match(/<<\s*(\w+)\s*$/);
if (tag && tag[1])
heredoc = tag[1];
}
return [count, cmd, !!special, args || "", heredoc];
return [count, cmd, !!special, args || ""];
},
get complQuote() complQuote,