[MediaWiki-commits] [Gerrit] Follow up on negative predicate return value cleanup - change (mediawiki...parsoid)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Follow up on negative predicate return value cleanup
......................................................................


Follow up on negative predicate return value cleanup

 * Discovered some more on eswiki:Lenguas_bereberes

 * Continues from 724749aac29814b97ce29081ea17e7a69d626e32

Change-Id: I1f1639fc7d6a00048f60cbaeb98a4694412e509b
---
M lib/pegTokenizer.pegjs.txt
1 file changed, 6 insertions(+), 7 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/pegTokenizer.pegjs.txt b/lib/pegTokenizer.pegjs.txt
index 3fc8f32..fb24fe0 100644
--- a/lib/pegTokenizer.pegjs.txt
+++ b/lib/pegTokenizer.pegjs.txt
@@ -63,13 +63,12 @@
                     // Change in assumption from a shallow array to a nested 
array.
                     if (res === null) { res = e.slice(0, i); }
                     internal_flatten(v, res);
-                } else if (v) {
+                } else if ( v !== null && v !== undefined ) {
                     if (res !== null) {
                         res.push(v);
                     }
                 } else {
-                    //console.error('falsy', v, e);
-                    if (res === null) { res = e.slice(0, i); }
+                    options.env.log("fatal", "falsy", e);
                 }
             }
 
@@ -2521,7 +2520,7 @@
   = r:( t:[^{}&'<|!]+ { return t.join(''); }
   / !inline_breaks r:(
       directive
-    / ![\r\n] [{}&<] ) { return r; }
+    / ![\r\n] q:[{}&<] { return q; } ) { return r; }
   )* {
       return flatten_string ( r );
   }
@@ -2529,7 +2528,7 @@
   = r:( t:[^{}&'<>|!]+ { return t.join(''); }
   / !inline_breaks r:(
       directive
-    / ![\r\n] [{}&<] ) { return r; }
+    / ![\r\n] q:[{}&<] { return q; } ) { return r; }
   )* {
       return flatten_string ( r );
   }
@@ -2537,7 +2536,7 @@
   = r:( t:[^{}&"<|!]+ { return t.join(''); }
   / !inline_breaks r:(
       directive
-    / ![\r\n] [{}&<] ) { return r; }
+    / ![\r\n] q:[{}&<] { return q; } ) { return r; }
   )* {
       return flatten_string ( r );
   }
@@ -2545,7 +2544,7 @@
   = r:( t:[^{}&"<>|!]+ { return t.join(''); }
   / !inline_breaks r:(
       directive
-    / ![\r\n] [{}&<] ) { return r; }
+    / ![\r\n] q:[{}&<] { return q; } ) { return r; }
   )* {
       return flatten_string ( r );
   }

-- 
To view, visit https://gerrit.wikimedia.org/r/131870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f1639fc7d6a00048f60cbaeb98a4694412e509b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits