Added some Quirrel functions and smarter object property highlighting

djspiewak · Oct 5, 2011 · de50e61 · de50e61
1 parent 30f6788
commit de50e61
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/quirrel.xml b/quirrel.xml
@@ -29,20 +29,26 @@
   	</SPAN>
 
   	<MARK_FOLLOWING TYPE="LITERAL1">/</MARK_FOLLOWING>
-  		
+
     <SEQ TYPE="NULL">:=</SEQ>
     <SEQ TYPE="KEYWORD1">::</SEQ>
+
+    <SPAN DELEGATE="OBJECT">
+    	<BEGIN>{</BEGIN>
+    	<END>}</END>
+    </SPAN>
 
-	<MARK_PREVIOUS TYPE="LITERAL4">:</MARK_PREVIOUS>
 	<MARK_FOLLOWING TYPE="LABEL" AT_WORD_START="TRUE">'</MARK_FOLLOWING>
 
     <KEYWORDS>
     	<KEYWORD1>new</KEYWORD1>
     	<KEYWORD1>where</KEYWORD1>
 
     	<FUNCTION>count</FUNCTION>
+    	<FUNCTION>max</FUNCTION>
     	<FUNCTION>mean</FUNCTION>
     	<FUNCTION>median</FUNCTION>
+    	<FUNCTION>min</FUNCTION>
     	<FUNCTION>mode</FUNCTION>
     	<FUNCTION>stdDev</FUNCTION>
     	<FUNCTION>sum</FUNCTION>
@@ -51,5 +57,10 @@
     	<KEYWORD2>false</KEYWORD2>
     </KEYWORDS>
   </RULES>
+
+  <RULES SET="OBJECT">
+  	<IMPORT DELEGATE="quirrel::MAIN"/>
+  	<MARK_PREVIOUS TYPE="KEYWORD4">:</MARK_PREVIOUS>
+  </RULES>
 </MODE>