renamed pre_* token kinds to predefined_*

Author: murphy

c/ruby.expected.raydebug

@@ -11,12 +11,12 @@ preprocessor(#define) ident(bo) reserved(do)
 preprocessor(#define) ident(when)operator(()ident(gun)operator(\)) comment(/**/)
 preprocessor(#define) ident(DATA) string<delimiter(")content(p 'Hello embedded world')delimiter(")>
 preprocessor(#define) ident(DIRTY)operator(()ident(argc)operator(,)ident(argv)operator(\))\
-ident(argc)operator(,)ident(argv)operator(,)pre_type(char)operator(=)ident(eval)operator(()\
+ident(argc)operator(,)ident(argv)operator(,)predefined_type(char)operator(=)ident(eval)operator(()\
 string<delimiter(")content(#{DATA.read})char(\\n)content([3,2,1])delimiter(")>\
 operator(\);)ident(sun)operator(=)ident(O)operator(.)ident(new)\
 reserved(if)operator(()integer(0)operator(\))
 
-pre_type(int)
+predefined_type(int)
 ident(sun)operator([]={)integer(12)operator(,)integer(9)operator(,)integer(16)operator(,)integer(9)operator(,)integer(2)operator(,)integer(1)operator(,)integer(7)operator(,)integer(1)operator(,)integer(3)operator(,)integer(9)operator(,)integer(27)operator(,)integer(4)operator(,) integer(13)operator(,)integer(2)operator(,)integer(11)operator(,)integer(5)operator(,)integer(4)operator(,)integer(1)operator(,)integer(25)operator(,)
 integer(5)operator(,)integer(0)operator(,)integer(1)operator(,)integer(14)operator(,)integer(9)operator(,)integer(15)operator(,)integer(4)operator(,)integer(26)operator(,)integer(9)operator(,)integer(23)operator(,)integer(2)operator(,)integer(17)operator(,)integer(6)operator(,)integer(31)operator(,) integer(6)operator(,)integer(10)operator(,)integer(8)operator(,)integer(22)operator(,)integer(9)operator(,)integer(21)operator(,)integer(1)operator(,)
 integer(24)operator(,)integer(8)operator(,)integer(20)operator(,)integer(8)operator(,)integer(18)operator(,)integer(9)operator(,)integer(29)operator(,)integer(5)operator(,)integer(9)operator(,)integer(5)operator(,)integer(1)operator(,)integer(1)operator(,)integer(28)operator(,)integer(8)operator(,)integer(8)operator(,)integer(1)operator(,)integer(30)operator(,) integer(9)operator(,)integer(6)operator(,)integer(8)operator(,) integer(5)operator(,)integer(1)operator(,)
@@ -29,7 +29,7 @@ integer(67)operator(,)integer(9)operator(,)integer(59)operator(,)integer(1)opera
 integer(28)operator(,)integer(90)operator(,)integer(29)operator(,) integer(71)operator(,)integer(4)operator(,)integer(55)operator(,)integer(9)operator(,)integer(84)operator(,)integer(28)operator(,)integer(82)operator(,)integer(29)operator(,)integer(101)operator(,)integer(5)operator(,) integer(103)operator(,)integer(9)operator(,) integer(98)operator(,)integer(35)operator(,)
 integer(97)operator(,)integer(1)operator(,)integer(94)operator(,)integer(35)operator(,)integer(93)operator(,)integer(1)operator(,)integer(100)operator(,)integer(35)operator(,)integer(92)operator(,)integer(31)operator(,)integer(99)operator(,)integer(5)operator(,)integer(96)operator(,)integer(39)operator(,)integer(95)operator(,)integer(5)operator(,)integer(102)operator(,)integer(35)operator(};)
 
-directive(void) ident(run)operator(()pre_type(int) ident(gun)operator(=)integer(0)operator(\)) operator({)        comment(// [gun]=[:GUN1,:GUN2])
+directive(void) ident(run)operator(()predefined_type(int) ident(gun)operator(=)integer(0)operator(\)) operator({)        comment(// [gun]=[:GUN1,:GUN2])
         ident(printf)operator(()string<delimiter(")content(run(\) %i)char(\\n)delimiter(")>operator(,) ident(gun)operator(\);)
         reserved(switch)operator(()ident(gun)operator(\)) operator({)
         reserved(case) ident(GUN1) ident(when)operator(()integer(2)operator(\))
@@ -41,9 +41,9 @@ directive(void) ident(run)operator(()pre_type(int) ident(gun)operator(=)integer(
         operator(})
 operator(})
 
-pre_type(int) ident(main)operator(()pre_type(int) ident(argc)operator(,) pre_type(char)operator(**) ident(argv)operator(\)) operator({)
+predefined_type(int) ident(main)operator(()predefined_type(int) ident(argc)operator(,) predefined_type(char)operator(**) ident(argv)operator(\)) operator({)
         ident(printf)operator(()string<delimiter(")content(hello world.   number of arguments=%i)char(\\n)delimiter(")>operator(,) ident(argc)operator(\);)
-        pre_type(int) ident(fun)operator(=)integer(5)operator(;)
+        predefined_type(int) ident(fun)operator(=)integer(5)operator(;)
         ident(bo) operator({)
                 ident(fun) operator(-=) integer(1)operator(;) comment(//.id - gun = fun)
                 ident(run)operator(()ident(fun)operator(\);)

c/strange.expected.raydebug

@@ -22,7 +22,7 @@ operator(()reserved(defn) ident(parital-namespace-matcher)
      operator(()reserved(=) operator(()reserved(type) ident(form)operator(\)) ident(java.lang.Class)operator(\))
      operator(()reserved(let) operator([)reserved(ns) operator(()reserved(second) operator(()reserved(re-find) regexp<delimiter(#")content(^class (.*\))content(\\.)content(\\w)content(+$)delimiter(")> operator(()reserved(str) ident(form)operator(\))operator(\))operator(\))operator(])
        operator(()reserved(map) operator(#()reserved(zero?) operator(()reserved(.)ident(indexOf) reserved(ns) operator(()reserved(str) ident(%)operator(\))operator(\))operator(\)) ident(namespaces)operator(\))operator(\))
-     pre_constant(true)
+     predefined_constant(true)
       operator(')operator(()operator(\))operator(\))operator(\))operator(\))
 
 operator(()reserved(def) ident(*tester*) operator(()ident(extend-tester) ident(secure-tester) operator(()ident(whitelist) operator(()ident(function-matcher) operator(')reserved(def) operator(')reserved(require) operator(')reserved(use)operator(\)) operator(()ident(parital-namespace-matcher) operator(')ident(clicky.sandbox)operator(\))operator(\))operator(\))operator(\))
@@ -89,9 +89,9 @@ operator(()reserved(defn) ident(first-update) operator([)operator(])
 		 operator(()reserved(sort-by) operator(()reserved(fn) operator([)ident(&) ident(_)operator(]) operator(()reserved(rand-int) integer(42)operator(\))operator(\)) operator(()reserved(map) 
 						    operator(()reserved(fn) operator([)ident(file)operator(]) operator(()reserved(vector) ident(file) operator(()reserved(symbol) operator(()reserved(str) ident(*base-name*) string<delimiter(")content(.)delimiter(")> operator(()ident(su/replace) operator(()reserved(second) operator(()reserved(re-find) regexp<delimiter(#")content(^)content(\\.)content(/data/(.*\))content(\\.)content(clj$)delimiter(")> operator(()reserved(str) ident(file)operator(\))operator(\))operator(\)) error(\\)reserved(/) error(\\)reserved(.)operator(\))operator(\))operator(\))operator(\))operator(\))
 						    ident(files)operator(\))operator(\))operator(\))operator(\))
-	   pre_constant(true)
-	   operator(()reserved(catch) ident(Exception) ident(e) pre_constant(false)operator(\))operator(\))
-	pre_constant(true) operator(()reserved(if) operator(()reserved(>) ident(c) integer(0)operator(\)) operator(()reserved(recur) operator(()reserved(dec) ident(c)operator(\))operator(\))operator(\))operator(\))operator(\))operator(\))operator(\))
+	   predefined_constant(true)
+	   operator(()reserved(catch) ident(Exception) ident(e) predefined_constant(false)operator(\))operator(\))
+	predefined_constant(true) operator(()reserved(if) operator(()reserved(>) ident(c) integer(0)operator(\)) operator(()reserved(recur) operator(()reserved(dec) ident(c)operator(\))operator(\))operator(\))operator(\))operator(\))operator(\))operator(\))
 
 operator(()reserved(defn) ident(-main) operator([)operator(])
   operator(()ident(first-update)operator(\))

clojure/clicky.expected.raydebug

@@ -120,7 +120,7 @@ operator(()reserved(defn) ident(span) operator([)ident(c) ident(content)operator
   operator(()reserved(str) string<delimiter(")content(<span class=')delimiter(")> ident(c) string<delimiter(")content('>)delimiter(")> operator(()ident(escape-html) ident(content)operator(\)) string<delimiter(")content(</span>)delimiter(")>operator(\))operator(\))
 
 operator(()reserved(defn) ident(html-to-stream) operator([)ident(stream) ident(root-class) ident(style-map) ident(tokenstream)operator(])
-  operator(()reserved(binding) operator([)pre_constant(*out*) ident(stream)operator(])
+  operator(()reserved(binding) operator([)predefined_constant(*out*) ident(stream)operator(])
     operator(()reserved(print) operator(()reserved(str) string<delimiter(")content(<span class=')delimiter(")> ident(root-class) string<delimiter(")content('>)delimiter(")>operator(\))operator(\))
     operator(()reserved(loop) operator([)operator([)ident(kind) ident(token) ident(&) ident(_)operator(]) operator(()reserved(first) ident(tokenstream)operator(\)) ident(tkns) operator(()reserved(next) ident(tokenstream)operator(\))operator(])
       operator(()reserved(let) operator([)ident(style) operator(()reserved(get) ident(style-map) ident(kind) operator(()reserved(name) ident(kind)operator(\))operator(\))operator(])
@@ -195,7 +195,7 @@ operator(()reserved(ns) ident(clj-highlight.syntax.general)operator(\))
 
 operator(()reserved(def) ident(didgets) string<delimiter(")content(0123456789abcdefghijklmnopqrstuvwxyz)delimiter(")>operator(\))
 
-operator(()reserved(def) ident(*do-profile*) pre_constant(false)operator(\))
+operator(()reserved(def) ident(*do-profile*) predefined_constant(false)operator(\))
 
 operator(()reserved(def) ident(*profile*) operator(()reserved(agent) operator({)operator(})operator(\))operator(\))
 
@@ -224,7 +224,7 @@ operator(()reserved(defmacro) ident(benchmark)
 	  ident(r#)operator(\))operator(\))operator(\))operator(\))
 
 operator(()reserved(defmacro) ident(profiled) operator([)ident(form)operator(])
-  operator(`)operator(()reserved(binding) operator([)ident(*do-profile*) pre_constant(true)operator(])
+  operator(`)operator(()reserved(binding) operator([)ident(*do-profile*) predefined_constant(true)operator(])
      operator(~)ident(form)operator(\))operator(\))
 
 

clojure/clj-highlight.expected.raydebug

@@ -99,7 +99,7 @@ operator(()reserved(defn) ident(seq-ref-combobox-model) operator([)ident(seq-ref
 	ident(listeners) operator(()reserved(atom) operator(#{)operator(})operator(\))
 	reserved(key) operator(()reserved(gensym) string<delimiter(")content(seq-ref-combobox-model-watch)delimiter(")>operator(\))
 	ident(m) operator(()ident(commbo-box-model)
-	   symbol(:mutable) pre_constant(true)
+	   symbol(:mutable) predefined_constant(true)
 	   symbol(:size) operator(()operator([)operator(]) operator(()reserved(count) operator(@)ident(seq-ref)operator(\))operator(\))
 	   symbol(:get-selected-item) operator(()operator([)operator(]) operator(()reserved(dosync) operator(()reserved(if) operator(()reserved(and) operator(@)ident(selected) operator(()reserved(some) operator(#()reserved(=) operator(@)ident(selected) ident(%)operator(\)) operator(@)ident(seq-ref)operator(\))operator(\)) operator(@)ident(selected) operator(()reserved(swap!) ident(selected) operator(()reserved(constantly) ident(nil)operator(\))operator(\))operator(\))operator(\))operator(\))
 	   symbol(:set-selected-item) operator(()operator([)ident(i)operator(]) operator(()reserved(dosync) operator(()reserved(if) operator(()reserved(and) ident(i) operator(()reserved(some) operator(#()reserved(=) ident(i) ident(%)operator(\)) operator(@)ident(seq-ref)operator(\))operator(\)) operator(()reserved(swap!) ident(selected) operator(()reserved(constantly) ident(i)operator(\))operator(\)) operator(()reserved(swap!) ident(selected) operator(()reserved(constantly) ident(nil)operator(\))operator(\))operator(\))operator(\))operator(\))
@@ -366,17 +366,17 @@ operator(()reserved(defn) ident(paint-donut) operator([)ident(g)operator(])
 operator(()reserved(defn) ident(graphics-example) operator([)operator(])
   operator(()ident(frame)
    symbol(:title) string<delimiter(")content(Graphics example)delimiter(")> 
-   symbol(:show) pre_constant(true) symbol(:pack) pre_constant(true)
+   symbol(:show) predefined_constant(true) symbol(:pack) predefined_constant(true)
    operator([)ident(p) operator(()ident(panel)
        symbol(:preferred-size) operator([)integer(360) integer(310)operator(])
-       symbol(:focusable) pre_constant(true)
+       symbol(:focusable) predefined_constant(true)
        symbol(:paint) operator(()operator([)ident(g)operator(])
 		 operator(()reserved(proxy-super) ident(paintComponent) ident(g)operator(\))
 		 operator(()ident(paint-donut) ident(g)operator(\))operator(\))operator(\))operator(])operator(\))operator(\))
 
 operator(()reserved(defn) ident(grid-bag-example) operator([)operator(])
   operator(()ident(frame) symbol(:title) string<delimiter(")content(Sort Visualizer)delimiter(")> symbol(:layout) symbol(:grid-bag)
-	 symbol(:show) pre_constant(true) symbol(:pack) pre_constant(true)
+	 symbol(:show) predefined_constant(true) symbol(:pack) predefined_constant(true)
 	 operator([)symbol(:gridx) integer(0) symbol(:gridy) integer(0) symbol(:anchor) symbol(:LINE_END)
 	  ident(_) operator(()ident(label) string<delimiter(")content(Algorithms)delimiter(")>operator(\))
 	  symbol(:gridy) integer(1)
@@ -395,7 +395,7 @@ operator(()reserved(defn) ident(button-example) operator([)operator(])
   operator(()ident(frame) symbol(:title) string<delimiter(")content(A Button Example)delimiter(")>
 	 symbol(:layout) operator(()ident(FlowLayout.)operator(\))
 	 symbol(:size) operator([)integer(220) integer(90)operator(])
-	 symbol(:show) pre_constant(true)
+	 symbol(:show) predefined_constant(true)
 	 operator([)ident(b1) operator(()ident(button) string<delimiter(")content(First)delimiter(")>operator(\))
 	  ident(b2) operator(()ident(button) string<delimiter(")content(Second)delimiter(")>operator(\))
 	  ident(lab) operator(()ident(label) string<delimiter(")content(Press a button)delimiter(")>operator(\))operator(])
@@ -415,7 +415,7 @@ operator(()reserved(defn) ident(convert-temp) operator([)ident(converter) ident(
 operator(()reserved(defn) ident(converter-example) operator([)operator(])
   operator(()reserved(let) operator([)ident(c) operator(()reserved(ref) string<delimiter(")delimiter(")>operator(\))
 	ident(f) operator(()reserved(ref) string<delimiter(")delimiter(")>operator(\))operator(])
-    operator(()ident(frame) symbol(:layout) symbol(:grid-bag) symbol(:show) pre_constant(true) symbol(:pack) ident(truef)
+    operator(()ident(frame) symbol(:layout) symbol(:grid-bag) symbol(:show) predefined_constant(true) symbol(:pack) ident(truef)
 	  operator([)symbol(:gridx) integer(0) symbol(:gridy) integer(0) symbol(:anchor) symbol(:LINE_END)
 	   ident(_) operator(()ident(label) string<delimiter(")content(C)delimiter(")>operator(\))
 	   symbol(:gridy) integer(1)
@@ -523,7 +523,7 @@ operator(()reserved(defmacro) ident(frame) operator([)ident(&) ident(args)operat
 	    operator(~@)operator(()reserved(if) operator(()symbol(:pack) ident(opts)operator(\))
 		operator([)operator(`)operator(()reserved(.)ident(pack)operator(\))operator(])operator(\))
 	    operator(~@)operator(()reserved(if) operator(()symbol(:show) ident(opts)operator(\))
-		operator([)operator(`)operator(()reserved(.)ident(setVisible) pre_constant(true)operator(\))operator(])operator(\))operator(\))operator(\))operator(\))operator(\))operator(\))operator(()reserved(ns) ident(clj-swing.label)
+		operator([)operator(`)operator(()reserved(.)ident(setVisible) predefined_constant(true)operator(\))operator(])operator(\))operator(\))operator(\))operator(\))operator(\))operator(\))operator(()reserved(ns) ident(clj-swing.label)
   operator(()symbol(:use) operator([)ident(clj-swing.core) symbol(:only) operator([)ident(add-action-listener) ident(icon-setters) ident(auto-setters)operator(])operator(])operator(\))
   operator(()symbol(:import) operator(()ident(javax.swing) ident(JLabel) ident(ImageIcon)operator(\))operator(\))operator(\))