[Qemacs-commit] qemacs clang.c extra-modes.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        16/12/23 07:21:46

Modified files:
        .              : clang.c extra-modes.c 

Log message:
        modes: small improvements
        - prevent ini_mode to match JSON files
        - add ".Sql" extension for sql_mode
        - add `protected`, `$this`, `as`, `null` and builtin functions as PHP 
keywords

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/qemacs/extra-modes.c?cvsroot=qemacs&r1=1.54&r2=1.55

Patches:
Index: clang.c
===================================================================
RCS file: /sources/qemacs/qemacs/clang.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- clang.c     23 Dec 2016 12:05:22 -0000      1.110
+++ clang.c     23 Dec 2016 12:21:46 -0000      1.111
@@ -1828,13 +1828,16 @@
 /*---------------- PHP programming language ----------------*/
 
 static const char php_keywords[] = {
-    "abstract|assert|break|case|catch|class|clone|const|continue|"
+    "abstract|as|assert|break|case|catch|class|clone|const|continue|"
     "declare|default|elseif|else|enddeclare|endif|endswitch|end|exit|"
     "extends|false|final|foreach|for|function|goto|if|implements|"
     "include_once|include|instanceof|interface|list|namespace|new|"
-    "overload|parent|private|public|require_once|require|return|"
+    "overload|parent|private|protected|public|require_once|require|return|"
+    "self|sizeof|static|switch|$this|throw|trait|true|try|use|var|while|"
     "self|sizeof|static|switch|throw|trait|true|try|use|var|while|"
-    "NULL|"
+    "NULL|null|$this"
+    // built-in pseudo functions
+    "array|count|defined|echo|empty|"
 };
 
 static const char php_types[] = {

Index: extra-modes.c
===================================================================
RCS file: /sources/qemacs/qemacs/extra-modes.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- extra-modes.c       26 Nov 2016 11:12:27 -0000      1.54
+++ extra-modes.c       23 Dec 2016 12:21:46 -0000      1.55
@@ -1148,7 +1148,7 @@
             continue;
         }
         /* Check for ^\[.+\]\n */
-        if (*p == '[' && p[1] != '[') {
+        if (*p == '[' && p[1] != '[' && p[1] != '{') {
             while (++p < p_end) {
                 if (*p == ']')
                     return 40;
@@ -1534,7 +1534,7 @@
 
 static ModeDef sql_mode = {
     .name = "SQL",
-    .extensions = "sql|mysql|sqlite|sqlplus|rdb|xdb|db",
+    .extensions = "sql|Sql|mysql|sqlite|sqlplus|rdb|xdb|db",
     .mode_probe = sql_mode_probe,
     .keywords = sql_keywords,
     .types = sql_types,