[php mode] Follow up on beb975f

Simplify some things, change a name.

Issue #2468

Author: marijnh

mode/php/php.js

@@ -12,30 +12,20 @@
     };
   }
 
-  // Two helper functions for encapsList
-  function matchFirst(list) {
-    return function (stream) {
-      for (var i = 0; i < list.length; ++i)
-        if (stream.match(list[i][0]))
-          return list[i][1];
-      return false;
-    };
-  }
+  // Helper for stringWithEscapes
   function matchSequence(list) {
-    if (list.length == 0) return encapsList;
+    if (list.length == 0) return stringWithEscapes;
     return function (stream, state) {
-      var result = list[0](stream, state);
-      if (result !== false) {
+      var patterns = list[0];
+      for (var i = 0; i < patterns.length; i++) if (stream.match(patterns[i][0])) {
         state.tokenize = matchSequence(list.slice(1));
-        return result;
-      }
-      else {
-        state.tokenize = encapsList;
-        return "string";
+        return patterns[i][1];
       }
+      state.tokenize = stringWithEscapes;
+      return "string";
     };
   }
-  function encapsList(stream, state) {
+  function stringWithEscapes(stream, state) {
     var escaped = false, next, end = false;
 
     if (stream.current() == '"') return "string";
@@ -52,20 +42,18 @@
       if (stream.match("[", false)) {
         // Match array operator
         state.tokenize = matchSequence([
-          matchFirst([["[", null]]),
-          matchFirst([
-            [/\d[\w\.]*/, "number"],
-            [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
-            [/[\w\$]+/, "variable"]
-          ]),
-          matchFirst([["]", null]])
+          [["[", null]],
+          [[/\d[\w\.]*/, "number"],
+           [/\$[a-zA-Z_][a-zA-Z0-9_]*/, "variable-2"],
+           [/[\w\$]+/, "variable"]],
+          [["]", null]]
         ]);
       }
       if (stream.match(/\-\>\w/, false)) {
         // Match object operator
         state.tokenize = matchSequence([
-          matchFirst([["->", null]]),
-          matchFirst([[/[\w]+/, "variable"]])
+          [["->", null]],
+          [[/[\w]+/, "variable"]]
         ]);
       }
       return "variable-2";
@@ -134,7 +122,7 @@
         if (!state.phpEncapsStack)
           state.phpEncapsStack = [];
         state.phpEncapsStack.push(0);
-        state.tokenize = encapsList;
+        state.tokenize = stringWithEscapes;
         return state.tokenize(stream, state);
       },
       "{": function(_stream, state) {
@@ -145,7 +133,7 @@
       "}": function(_stream, state) {
         if (state.phpEncapsStack && state.phpEncapsStack.length > 0)
           if (--state.phpEncapsStack[state.phpEncapsStack.length - 1] == 0)
-            state.tokenize = encapsList;
+            state.tokenize = stringWithEscapes;
         return false;
       }
     }