Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'qcodeedit' of http://www.gilesbathgate.com/openscad int…

…o tmp

git-svn-id: http://svn.clifford.at/openscad/trunk@521 b57f626f-c46c-0410-a088-ec61d464b74c
  • Loading branch information...
commit 48735d958351445aba2be42f9b0b484d9c305443 1 parent 5a3e4f6
kintel authored
Showing with 21 additions and 36 deletions.
  1. +21 −36 qxs/openscad.qnfa
View
57 qxs/openscad.qnfa
@@ -23,7 +23,25 @@
<stop exclusive="false">\n</stop>
<sequence id="escape" format="escapeseq" >\\[nrtvf\\"'\n]</sequence>
</context>
-
+
+ <context id="use" format="keyword" transparency="true" stayOnLine="true" >
+ <start>use</start>
+ <stop exclusive="false">\n</stop>
+ <context id="data/string" format="text" >
+ <start>&lt;</start>
+ <stop>&gt;</stop>
+ </context>
+ </context>
+
+ <context id="include" format="keyword" transparency="true" stayOnLine="true" >
+ <start>include</start>
+ <stop exclusive="false">\n</stop>
+ <context id="data/string" format="text" >
+ <start>&lt;</start>
+ <stop>&gt;</stop>
+ </context>
+ </context>
+
<sequence parenthesis="round:open">(</sequence>
<sequence parenthesis="round:close">)</sequence>
<sequence parenthesis="curly:open" indent="1" fold="1">{</sequence>
@@ -31,15 +49,9 @@
<sequence parenthesis="square:open">\[</sequence>
<sequence parenthesis="square:close">\]</sequence>
- <list id="keywords/visibility" format="keyword">
- <word parenthesis="visibility:boundary" fold="1" indent="1">public</word>
- <word parenthesis="visibility:boundary" fold="1" indent="1">protected</word>
- <word parenthesis="visibility:boundary" fold="1" indent="1">private</word>
- </list>
-
<list id="keywords/toplevel" format="keyword">
<word>module</word>
- <word>func</word>
+ <word>function</word>
</list>
<list id="keywords/blocks" format="keyword">
@@ -48,39 +60,12 @@
<word>else</word>
</list>
- <list id="keywords/oop" format="keyword">
- <word>using</word>
- </list>
-
<list id="keywords/others" format="keyword">
- <word>asm</word>
<word>false</word>
<word>true</word>
- <word>template</word>
- <word>typename</word>
- <word>return</word>
- <word>sizeof</word>
- <word>typeid</word>
- <word>typedef</word>
- </list>
-
- <list id="ansi/trigraph" format="extra-keyword">
- <prefix>\?\?</prefix>
- <word>\(</word>
- <word>\)</word>
- <word>&lt;</word>
- <word>&gt;</word>
- <word>=</word>
- <word>/</word>
- <word>&apos;</word>
- <word>!</word>
- <word>-</word>
+ <word>undef</word>
</list>
- <word id="QtCasts" format="extra-keyword">q$w+_cast</word>
-
<word id="data/float" format="numbers">-?[0-9]*.[0-9]+f?</word>
- <word id="data/hexadecimal" format="numbers">0[xX][0-9a-fA-F]+[ulUL]*</word>
- <word id="data/octal" format="numbers">0[0-7]+</word>
<word id="data/decimal" format="numbers">-?[0-9]+[ulUL]*</word>
</QNFA>
Please sign in to comment.
Something went wrong with that request. Please try again.