[Qemacs-commit] qemacs clang.c TODO.org

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        17/03/18 10:24:47

Modified files:
        .              : clang.c TODO.org 

Log message:
        clang: fix alignment bug on ternary operator

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.114&r2=1.115
http://cvs.savannah.gnu.org/viewcvs/qemacs/TODO.org?cvsroot=qemacs&r1=1.27&r2=1.28

Patches:
Index: clang.c
===================================================================
RCS file: /sources/qemacs/qemacs/clang.c,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -b -r1.114 -r1.115
--- clang.c     16 Mar 2017 17:18:29 -0000      1.114
+++ clang.c     18 Mar 2017 14:24:47 -0000      1.115
@@ -864,9 +864,11 @@
                     }
                     break;
                 case ':':
-                    /* a label line is ignored */
-                    /* XXX: incorrect, should check for ternary operator ?: */
-                    if (style == C_STYLE_DEFAULT)
+                    /* a label line is ignored: regular, case and default 
labels
+                     * are assumed to have no preceding space
+                     */
+                    if (style == C_STYLE_DEFAULT
+                    &&  (p == buf || !qe_isspace(p[-1] & CHAR_MASK)))
                         goto prev_line;
                     break;
                 default:

Index: TODO.org
===================================================================
RCS file: /sources/qemacs/qemacs/TODO.org,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- TODO.org    18 Mar 2017 14:13:33 -0000      1.27
+++ TODO.org    18 Mar 2017 14:24:47 -0000      1.28
@@ -53,7 +53,6 @@
   cp="200D" na="ZERO WIDTH JOINER" alias="ZWJ"
   cp="200E" na="LEFT-TO-RIGHT MARK" alias="LRM"
   cp="200F" na="RIGHT-TO-LEFT MARK" alias="RLM"
-** clang: indentation bug on {\nputchar(expr ? 'a' : 'b');\n}
 ** extras: do_transpose should take argval and swap distant fragments
 ** completion: minibuffer completion: bad return on C-x C-f . SPC qe SPC RET
 ** config: reparse .qerc upon change