From fad826dcfe095d57aa5faf6cc8a863069f65b0d6 Mon Sep 17 00:00:00 2001
From: Robin Haberkorn <robin.haberkorn@googlemail.com>
Date: Sat, 24 Nov 2012 17:56:29 +0100
Subject: allow symbolic names (symbols) being specified for the scintilla (ES)
 command

 * new syntax is <[lParam,[wParam,[msg]]]>ES[msg[,wParam[,lParam]]]$[lParam string]$
 * symbols are matched case-insensitive, the leading SCI_ for message symbols may be omitted
 * added support for more multiple string arguments (for commands in general)
 * fixed "C conditional: succeeds for every alpanumeric character, dot, dollar or underscore
 * added SCLEX_ and SCE_ constants as symbols
 * updated teco.ini: using symbolic names is preferred since that way code does not depend on the current Scintilla version
---
 symbols-extract.tes | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'symbols-extract.tes')

diff --git a/symbols-extract.tes b/symbols-extract.tes
index 08ab2d7..6497324 100755
--- a/symbols-extract.tes
+++ b/symbols-extract.tes
@@ -1,10 +1,10 @@
 #!./sciteco-minimal -m
-! ./symbols-extract.tes <input file> <output file> <prefix> <array name> !
+! ./symbols-extract.tes <input file> <output file> <prefix pattern list> <array name> !
 
 ! <pos1,pos2>Mc - Compare string at pos1 with string at pos2 !
 @^Uc{
   U.2U.1 -.%.1^[ -.%.2^[
-  <Q.1A-(Q.2A)U.c Q.1A"A|Q.2A"A|;'' Q.c"N;' %.1^[%.2>
+  <Q.1A-(Q.2A)U.c Q.1A"C|Q.2A"C|;'' Q.c"N;' %.1^[%.2>
   Q.c
 }
 
@@ -44,7 +44,7 @@
 LR 0Xi 2LR 0Xo 2LR 0Xp 2LR 0Xn HK
 
 ! copy all defines in input file beginning with prefix !
-EBQi <S#define^SQp; :Xa> EF
+EBQi <S#defineS[Qp]; -SS :Xa> EF
 
 ! sort all defines !
 Ga ZJB 0,.Mq J
@@ -61,13 +61,12 @@ I/*
 static const SymbolList::Entry entries[] = {
 
 <
-  .,W.Xa 0K
-  I#ifdef QpQa
+  .,W.Xa 0KK
+  I#ifdef Qa
+	{"Qa", ^EQa},
+#endif
 
-  ^I{"Qa", V I ^EQp^EQa},
-#endif
-  L .-Z;
->
+.-Z;>
 I};
 
 /* overwrites weak object in symbols.cpp */
-- 
cgit v1.2.3