diff options
| -rw-r--r-- | lib/coderay/scanners/groovy.rb | 18 | ||||
| -rw-r--r-- | test/scanners/groovy/pleac.expected.raydebug | 242 | ||||
| -rw-r--r-- | test/scanners/groovy/raistlin77.expected.raydebug | 28 |
3 files changed, 140 insertions, 148 deletions
diff --git a/lib/coderay/scanners/groovy.rb b/lib/coderay/scanners/groovy.rb index 9486beb..e8901bf 100644 --- a/lib/coderay/scanners/groovy.rb +++ b/lib/coderay/scanners/groovy.rb @@ -9,25 +9,17 @@ module Scanners register_for :groovy # TODO: Check this! - KEYWORDS = Java::KEYWORDS + %w[ + GROOVY_KEYWORDS = %w[ as assert def in ] KEYWORDS_EXPECTING_VALUE = WordList.new.add %w[ case instanceof new return throw typeof while as assert in ] + GROOVY_MAGIC_VARIABLES = %w[ it ] - MAGIC_VARIABLES = Java::MAGIC_VARIABLES + %w[ it ] - # DIRECTIVES = %w[ - # abstract extends final implements native private protected public - # static strictfp synchronized threadsafe throws transient volatile - # ] - - IDENT_KIND = WordList.new(:ident). - add(KEYWORDS, :keyword). - add(MAGIC_VARIABLES, :local_variable). - add(TYPES, :type). - add(BuiltinTypes::List, :pre_type). - add(DIRECTIVES, :directive) + IDENT_KIND = Java::IDENT_KIND.dup. + add(GROOVY_KEYWORDS, :keyword). + add(GROOVY_MAGIC_VARIABLES, :local_variable) ESCAPE = / [bfnrtv$\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x UNICODE_ESCAPE = / u[a-fA-F0-9]{4} /x # no 4-byte unicode chars? U[a-fA-F0-9]{8} diff --git a/test/scanners/groovy/pleac.expected.raydebug b/test/scanners/groovy/pleac.expected.raydebug index 574d08f..244cdf4 100644 --- a/test/scanners/groovy/pleac.expected.raydebug +++ b/test/scanners/groovy/pleac.expected.raydebug @@ -163,7 +163,7 @@ keyword(def) method(unpack)operator(()pre_type(String) ident(format)operator(,) keyword(else) ident(dataOffset) operator(-=) ident(count) keyword(break) keyword(default)operator(:) - keyword(throw) keyword(new) pre_type(RuntimeException)operator(()string<delimiter(')content(Unknown action token)delimiter(')>operator(,) ident(formatOffset)(\)) + keyword(throw) keyword(new) exception(RuntimeException)operator(()string<delimiter(')content(Unknown action token)delimiter(')>operator(,) ident(formatOffset)(\)) (}) ident(formatOffset) operator(+=) ident(tokenLen) operator(+) integer(1) (}) @@ -185,9 +185,9 @@ comment(//---------------------------------------------------------------------- comment(// @@PLEAC@@_1.2) comment(//----------------------------------------------------------------------------------) comment(// use b if b is true, else c) -ident(b) operator(=) keyword(false)operator(;) ident(c) operator(=) string<delimiter(')content(cat)delimiter(')> +ident(b) operator(=) pre_constant(false)operator(;) ident(c) operator(=) string<delimiter(')content(cat)delimiter(')> keyword(assert) operator(()ident(b) operator(?) ident(b) operator(:) ident(c)(\)) operator(==) string<delimiter(')content(cat)delimiter(')> -ident(b) operator(=) keyword(true) +ident(b) operator(=) pre_constant(true) keyword(assert) operator(()ident(b) operator(?) ident(b) operator(:) ident(c)(\)) comment(// can be simplified to 'b || c' if c is a boolean) comment(// strictly speaking, b doesn't have to be a boolean,) @@ -196,7 +196,7 @@ ident(b) operator(=) type([]) keyword(assert) operator(()ident(b) operator(?) ident(b) operator(:) ident(c)(\)) operator(==) string<delimiter(')content(cat)delimiter(')> comment(// set x to y unless x is already true) -ident(x) operator(=) keyword(false)operator(;) ident(y) operator(=) string<delimiter(')content(dog)delimiter(')> +ident(x) operator(=) pre_constant(false)operator(;) ident(y) operator(=) string<delimiter(')content(dog)delimiter(')> keyword(if) operator(()operator(!)ident(x)(\)) ident(x) operator(=) ident(y) keyword(assert) ident(x) operator(==) string<delimiter(')content(dog)delimiter(')> comment(// can be simplified to 'x ||= y' if y is a boolean) @@ -214,7 +214,7 @@ comment(// test for nullity then for emptyness) keyword(def) method(setDefaultIfNullOrEmpty)operator(()ident(startingPoint)(\)) operator({) operator(()operator(!)ident(startingPoint) operator(||) ident(startingPoint)operator(.)ident(length)operator(()(\)) operator(==) integer(0)(\)) operator(?) string<delimiter(')content(Greenwich)delimiter(')> operator(:) ident(startingPoint) (}) -keyword(assert) ident(setDefaultIfNullOrEmpty)operator(()keyword(null)(\)) operator(==) string<delimiter(')content(Greenwich)delimiter(')> +keyword(assert) ident(setDefaultIfNullOrEmpty)operator(()pre_constant(null)(\)) operator(==) string<delimiter(')content(Greenwich)delimiter(')> keyword(assert) ident(setDefaultIfNullOrEmpty)operator(()string<delimiter(')delimiter(')>(\)) operator(==) string<delimiter(')content(Greenwich)delimiter(')> keyword(assert) ident(setDefaultIfNullOrEmpty)operator(()string<delimiter(')content(Something else)delimiter(')>(\)) operator(==) string<delimiter(')content(Something else)delimiter(')> comment(//----------------------------------------------------------------------------------) @@ -556,7 +556,7 @@ keyword(def) method(psgrep)operator(()ident(s)(\)) operator({) ident(values) operator(=) ident(unpack)operator(()ident(format)operator(,) local_variable(it)(\))operator(.)ident(toList)operator(()(\))operator(.)ident(collect)operator({) keyword(try) operator({) keyword(return) local_variable(it)operator(.)ident(toInteger)operator(()(\)) - (}) keyword(catch)operator(()pre_type(NumberFormatException) ident(e)(\)) operator({) + (}) keyword(catch)operator(()exception(NumberFormatException) ident(e)(\)) operator({) keyword(return) local_variable(it)operator(.)ident(trim)operator(()(\)) (}) (}) @@ -591,7 +591,7 @@ type(int) ident(nb) operator(=) integer(0) keyword(try) operator({) ident(nb) operator(=) pre_type(NumberFormat)operator(.)ident(getInstance)operator(()(\))operator(.)ident(parse)operator(()string<delimiter(')content(33.5)delimiter(')>(\)) comment(// '.5' will be ignored) ident(nb) operator(=) pre_type(NumberFormat)operator(.)ident(getInstance)operator(()(\))operator(.)ident(parse)operator(()string<delimiter(')content(abc)delimiter(')>(\)) -(}) keyword(catch) operator(()pre_type(ParseException) ident(ex)(\)) operator({) +(}) keyword(catch) operator(()exception(ParseException) ident(ex)(\)) operator({) keyword(assert) ident(ex)operator(.)ident(getMessage)operator(()(\))operator(.)ident(contains)operator(()string<delimiter(')content(abc)delimiter(')>(\)) (}) keyword(assert) ident(nb) operator(==) integer(33) @@ -601,7 +601,7 @@ keyword(try) operator({) keyword(assert) ident(nb) operator(==) integer(34) ident(nb) operator(=) keyword(new) pre_type(Integer)operator(()string<delimiter(')content(35)delimiter(')>(\)) ident(nb) operator(=) pre_type(Integer)operator(.)ident(parseInt)operator(()string<delimiter(')content(abc)delimiter(')>(\)) -(}) keyword(catch) operator(()pre_type(NumberFormatException) ident(ex)(\)) operator({) +(}) keyword(catch) operator(()exception(NumberFormatException) ident(ex)(\)) operator({) keyword(assert) ident(ex)operator(.)ident(getMessage)operator(()(\))operator(.)ident(contains)operator(()string<delimiter(')content(abc)delimiter(')>(\)) (}) keyword(assert) ident(nb) operator(==) integer(35) @@ -1194,13 +1194,13 @@ type(class) class(MailHopDelta) operator({) keyword(def) method(extractHeaders)operator(()ident(mail)(\)) operator({) ident(headers) operator(=) type([]) - keyword(def) ident(isHeader) operator(=) keyword(true) + keyword(def) ident(isHeader) operator(=) pre_constant(true) keyword(def) ident(currentHeader) operator(=) string<delimiter(')delimiter(')> ident(mail)operator(.)ident(split)operator(()string<delimiter(')content(\\n)delimiter(')>(\))operator(.)ident(each)operator({) ident(line) operator(->) keyword(if) operator(()operator(!)ident(isHeader)(\)) keyword(return) keyword(switch)operator(()ident(line)(\)) operator({) keyword(case) operator(~)regexp<delimiter(/)content(^)char(\\s)content(*)content($)delimiter(/)>operator(:) - ident(isHeader) operator(=) keyword(false) + ident(isHeader) operator(=) pre_constant(false) keyword(if) operator(()ident(currentHeader)(\)) ident(headers) operator(<)operator(<) ident(currentHeader) keyword(break) keyword(case) operator(~)regexp<delimiter(/)content(^)char(\\s)content(+.*)delimiter(/)>operator(:) @@ -1713,11 +1713,11 @@ comment(// @@PLEAC@@_5.2) comment(//----------------------------------------------------------------------------------) keyword(assert) operator([)string<delimiter(')content(Banana)delimiter(')>operator(,) string<delimiter(')content(Martini)delimiter(')>(])operator(.)ident(collect)operator({) ident(foodColor)operator(.)ident(containsKey)operator(()local_variable(it)(\))operator(?)string<delimiter(')content(food)delimiter(')>operator(:)string<delimiter(')content(drink)delimiter(')> (}) operator(==) operator([) string<delimiter(')content(food)delimiter(')>operator(,) string<delimiter(')content(drink)delimiter(')> (]) -ident(age) operator(=) operator([)key(Toddler)operator(:)integer(3)operator(,) key(Unborn)operator(:)integer(0)operator(,) key(Phantasm)operator(:)keyword(null)(]) +ident(age) operator(=) operator([)key(Toddler)operator(:)integer(3)operator(,) key(Unborn)operator(:)integer(0)operator(,) key(Phantasm)operator(:)pre_constant(null)(]) operator([)string<delimiter(')content(Toddler)delimiter(')>operator(,) string<delimiter(')content(Unborn)delimiter(')>operator(,) string<delimiter(')content(Phantasm)delimiter(')>operator(,) string<delimiter(')content(Relic)delimiter(')>(])operator(.)ident(each)operator({) ident(key) operator(->) ident(print) string<delimiter(")inline<inline_delimiter($)ident(key)>content(: )delimiter(")> keyword(if) operator(()ident(age)operator(.)ident(containsKey)operator(()ident(key)(\))(\)) ident(print) string<delimiter(')content(has key )delimiter(')> - keyword(if) operator(()ident(age)operator(.)ident(containsKey)operator(()ident(key)(\)) operator(&&) ident(age)operator([)ident(key)(])operator(!=)keyword(null)(\)) ident(print) string<delimiter(')content(non-null )delimiter(')> + keyword(if) operator(()ident(age)operator(.)ident(containsKey)operator(()ident(key)(\)) operator(&&) ident(age)operator([)ident(key)(])operator(!=)pre_constant(null)(\)) ident(print) string<delimiter(')content(non-null )delimiter(')> keyword(if) operator(()ident(age)operator(.)ident(containsKey)operator(()ident(key)(\)) operator(&&) ident(age)operator([)ident(key)(])(\)) ident(print) string<delimiter(')content(true )delimiter(')> ident(println) string<delimiter(')delimiter(')> (}) @@ -2025,7 +2025,7 @@ type(class) class(DuNode) operator({) comment(// returns substring before last "/", otherwise null) keyword(def) method(getParent)operator(()(\)) operator({) keyword(def) ident(p) operator(=) ident(name)operator(.)ident(replaceAll)operator(()regexp<delimiter(/)char(\\/)content([^)char(\\/)content(]+)content($)delimiter(/)>operator(,)string<delimiter(')delimiter(')>(\)) - keyword(return) operator(()ident(p) operator(==) ident(name)(\)) operator(?) keyword(null) operator(:) ident(p) + keyword(return) operator(()ident(p) operator(==) ident(name)(\)) operator(?) pre_constant(null) operator(:) ident(p) (}) (}) @@ -3449,8 +3449,8 @@ keyword(def) method(grepStream)operator(()ident(s)operator(,) ident(name)(\)) op (}) (}) (}) - keyword(def) ident(display) operator(=) keyword(true) - keyword(if) operator(()operator(()ident(o_match) operator(&&) ident(count) operator(==) integer(0)(\)) operator(||) operator(()ident(o_nomatch) operator(&&) ident(count) operator(!=) integer(0)(\))(\)) ident(display) operator(=) keyword(false) + keyword(def) ident(display) operator(=) pre_constant(true) + keyword(if) operator(()operator(()ident(o_match) operator(&&) ident(count) operator(==) integer(0)(\)) operator(||) operator(()ident(o_nomatch) operator(&&) ident(count) operator(!=) integer(0)(\))(\)) ident(display) operator(=) pre_constant(false) keyword(if) operator(()ident(fileMode) operator(&&) ident(display)(\)) operator({) ident(filefields) operator(=) type([]) keyword(if) operator(()operator(!)ident(o_noname)(\)) ident(filefields) operator(+=) ident(name) @@ -3552,7 +3552,7 @@ comment(// For output Java use OutputStreams or Writers. Can throw FileNotFound) comment(// or IO exceptions. There are also other flavours of stream: buffered,) comment(// data, filters, objects, ...) ident(outFile) operator(=) keyword(new) pre_type(File)operator(()ident(outPath)(\)) -ident(appendFlag) operator(=) keyword(false) +ident(appendFlag) operator(=) pre_constant(false) ident(outStream) operator(=) keyword(new) pre_type(FileOutputStream)operator(()ident(outFile)operator(,) ident(appendFlag)(\)) ident(writer) operator(=) keyword(new) pre_type(FileWriter)operator(()ident(outFile)operator(,) ident(appendFlag)(\)) ident(outChannel) operator(=) ident(outStream)operator(.)ident(channel) @@ -3593,7 +3593,7 @@ comment(//---------------------------------------------------------------------- comment(// The exception raised in Groovy reports the filename) keyword(try) operator({) keyword(new) pre_type(File)operator(()string<delimiter(')content(unknown_path/bad_file.ext)delimiter(')>(\))operator(.)ident(text) -(}) keyword(catch) operator(()pre_type(Exception) ident(ex)(\)) operator({) +(}) keyword(catch) operator(()exception(Exception) ident(ex)(\)) operator({) pre_type(System)operator(.)ident(err)operator(.)ident(println)operator(()ident(ex)operator(.)ident(message)(\)) (}) comment(// =>) @@ -3605,7 +3605,7 @@ comment(//---------------------------------------------------------------------- keyword(try) operator({) ident(temp) operator(=) pre_type(File)operator(.)ident(createTempFile)operator(()string<delimiter(")content(prefix)delimiter(")>operator(,) string<delimiter(")content(.suffix)delimiter(")>(\)) ident(temp)operator(.)ident(deleteOnExit)operator(()(\)) -(}) keyword(catch) operator(()pre_type(IOException) ident(ex)(\)) operator({) +(}) keyword(catch) operator(()exception(IOException) ident(ex)(\)) operator({) pre_type(System)operator(.)ident(err)operator(.)ident(println)operator(()string<delimiter(")content(Temp file could not be created)delimiter(")>(\)) (}) comment(//----------------------------------------------------------------------------------) @@ -3662,13 +3662,13 @@ comment(// involve file arguments. The reader should also consider using a) comment(// pre-packaged options parser package (there are several popular) comment(// ones\) rather than the hard-coded processing examples shown here.) -ident(chopFirst) operator(=) keyword(false) +ident(chopFirst) operator(=) pre_constant(false) ident(columns) operator(=) integer(0) ident(args) operator(=) operator([)string<delimiter(')content(-c)delimiter(')>operator(,) string<delimiter(')content(-30)delimiter(')>operator(,) string<delimiter(')content(somefile)delimiter(')>(]) comment(// demo1: optional c) keyword(if) operator(()ident(args)operator([)integer(0)(]) operator(==) string<delimiter(')content(-c)delimiter(')>(\)) operator({) - ident(chopFirst) operator(=) keyword(true) + ident(chopFirst) operator(=) pre_constant(true) ident(args) operator(=) ident(args)operator([)integer(1)operator(..)operator(-)integer(1)(]) (}) @@ -3686,17 +3686,17 @@ keyword(assert) ident(columns) operator(==) integer(30) comment(// demo3: multiple args (again consider option parsing package\)) ident(args) operator(=) operator([)string<delimiter(')content(-n)delimiter(')>operator(,)string<delimiter(')content(-a)delimiter(')>operator(,)string<delimiter(')content(file1)delimiter(')>operator(,)string<delimiter(')content(file2)delimiter(')>(]) -ident(nostdout) operator(=) keyword(false) -ident(append) operator(=) keyword(false) -ident(unbuffer) operator(=) keyword(false) -ident(ignore_ints) operator(=) keyword(false) +ident(nostdout) operator(=) pre_constant(false) +ident(append) operator(=) pre_constant(false) +ident(unbuffer) operator(=) pre_constant(false) +ident(ignore_ints) operator(=) pre_constant(false) ident(files) operator(=) type([]) ident(args)operator(.)ident(each)operator({) ident(arg) operator(->) keyword(switch)operator(()ident(arg)(\)) operator({) - keyword(case) string<delimiter(')content(-n)delimiter(')>operator(:) ident(nostdout) operator(=) keyword(true)operator(;) keyword(break) - keyword(case) string<delimiter(')content(-a)delimiter(')>operator(:) ident(append) operator(=) keyword(true)operator(;) keyword(break) - keyword(case) string<delimiter(')content(-u)delimiter(')>operator(:) ident(unbuffer) operator(=) keyword(true)operator(;) keyword(break) - keyword(case) string<delimiter(')content(-i)delimiter(')>operator(:) ident(ignore_ints) operator(=) keyword(true)operator(;) keyword(break) + keyword(case) string<delimiter(')content(-n)delimiter(')>operator(:) ident(nostdout) operator(=) pre_constant(true)operator(;) keyword(break) + keyword(case) string<delimiter(')content(-a)delimiter(')>operator(:) ident(append) operator(=) pre_constant(true)operator(;) keyword(break) + keyword(case) string<delimiter(')content(-u)delimiter(')>operator(:) ident(unbuffer) operator(=) pre_constant(true)operator(;) keyword(break) + keyword(case) string<delimiter(')content(-i)delimiter(')>operator(:) ident(ignore_ints) operator(=) pre_constant(true)operator(;) keyword(break) keyword(default)operator(:) ident(files) operator(+=) ident(arg) (}) (}) @@ -3718,7 +3718,7 @@ comment(//% groovy -pe "line.toLowerCase(\)") comment(// count chunks but skip comments and stop when reaching "__DATA__" or "__END__") -ident(chunks) operator(=) integer(0)operator(;) ident(done) operator(=) keyword(false) +ident(chunks) operator(=) integer(0)operator(;) ident(done) operator(=) pre_constant(false) ident(testfile) operator(=) keyword(new) pre_type(File)operator(()string<delimiter(')content(Pleac/data/chunks.txt)delimiter(')>(\)) comment(// change on your system) ident(lines) operator(=) ident(testfile)operator(.)ident(readLines)operator(()(\)) keyword(for) operator(()ident(line) keyword(in) ident(lines)(\)) operator({) @@ -3726,7 +3726,7 @@ keyword(for) operator(()ident(line) keyword(in) ident(lines)(\)) operator({) ident(words) operator(=) ident(line)operator(.)ident(split)operator(()regexp<delimiter(/)content([^)char(\\w)content(#]+)delimiter(/)>(\))operator(.)ident(toList)operator(()(\)) keyword(for) operator(()ident(word) keyword(in) ident(words)(\)) operator({) keyword(if) operator(()ident(word) operator(=~) regexp<delimiter(/)content(^#)delimiter(/)>(\)) keyword(break) - keyword(if) operator(()ident(word) keyword(in) operator([)string<delimiter(")content(__DATA__)delimiter(")>operator(,) string<delimiter(")content(__END__)delimiter(")>(])(\)) operator({) ident(done) operator(=) keyword(true)operator(;) keyword(break) (}) + keyword(if) operator(()ident(word) keyword(in) operator([)string<delimiter(")content(__DATA__)delimiter(")>operator(,) string<delimiter(")content(__END__)delimiter(")>(])(\)) operator({) ident(done) operator(=) pre_constant(true)operator(;) keyword(break) (}) ident(chunks) operator(+=) integer(1) (}) keyword(if) operator(()ident(done)(\)) keyword(break) @@ -3842,11 +3842,11 @@ keyword(def) method(processFileWithTryLock)operator(()ident(file)operator(,) ide keyword(def) ident(MAX_ATTEMPTS) operator(=) integer(30) keyword(for) operator(()ident(i) keyword(in) integer(0)operator(..<)ident(MAX_ATTEMPTS)(\)) operator({) ident(lock) operator(=) ident(channel)operator(.)ident(tryLock)operator(()(\)) - keyword(if) operator(()ident(lock) operator(!=) keyword(null)(\)) keyword(break) + keyword(if) operator(()ident(lock) operator(!=) pre_constant(null)(\)) keyword(break) ident(println) string<delimiter(')content(Could not get lock, pausing ...)delimiter(')> pre_type(Thread)operator(.)ident(sleep)operator(()integer(500)(\)) comment(// 500 millis = 0.5 secs) (}) - keyword(if) operator(()ident(lock) operator(==) keyword(null)(\)) operator({) + keyword(if) operator(()ident(lock) operator(==) pre_constant(null)(\)) operator({) ident(println) string<delimiter(')content(Unable to acquire lock, aborting ...)delimiter(')> (}) keyword(else) operator({) ident(processStream)operator(()ident(random)(\)) @@ -3886,7 +3886,7 @@ comment(// From a FileInput or Output Stream you can ask for the FileDescriptor) comment(// which has a sync(\) method - but you wouldn't you'd just use flush(\).) ident(inputStream) operator(=) ident(testfile)operator(.)ident(newInputStream)operator(()(\)) comment(// returns a buffered input stream) -ident(autoFlush) operator(=) keyword(true) +ident(autoFlush) operator(=) pre_constant(true) ident(printStream) operator(=) keyword(new) pre_type(PrintStream)operator(()ident(outStream)operator(,) ident(autoFlush)(\)) ident(printWriter) operator(=) keyword(new) pre_type(PrintWriter)operator(()ident(outStream)operator(,) ident(autoFlush)(\)) comment(//----------------------------------------------------------------------------------) @@ -4072,7 +4072,7 @@ comment(// DEP_DISTFILES = $(DIST_COMMON\) $(SOURCES\) $(HEADERS\) \\ // $(EXTRA_DIST\)) ident(lines) operator(=) type([]) -ident(continuing) operator(=) keyword(false) +ident(continuing) operator(=) pre_constant(false) ident(regex) operator(=) regexp<delimiter(/)char(\\\\)content($)delimiter(/)> ident(testfile)operator(.)ident(eachLine)operator({) ident(line) operator(->) ident(stripped) operator(=) ident(line)operator(.)ident(replaceAll)operator(()ident(regex)operator(,)string<delimiter(')delimiter(')>(\)) @@ -4137,7 +4137,7 @@ comment(// (variation to Perl example\)) comment(// with a StreamTokenizer (counting words and numbers in Pleac chapter 8 source file\)) ident(words) operator(=) integer(0)operator(;) ident(numbers) operator(=) integer(0) ident(st) operator(=) keyword(new) pre_type(StreamTokenizer)operator(()ident(testfile)operator(.)ident(newReader)operator(()(\))(\)) -ident(st)operator(.)ident(slashSlashComments)operator(()keyword(true)(\)) comment(// ignore words and numbers in comments) +ident(st)operator(.)ident(slashSlashComments)operator(()pre_constant(true)(\)) comment(// ignore words and numbers in comments) keyword(while) operator(()ident(st)operator(.)ident(nextToken)operator(()(\)) operator(!=) pre_type(StreamTokenizer)operator(.)ident(TT_EOF)(\)) operator({) keyword(if) operator(()ident(st)operator(.)ident(ttype) operator(==) pre_type(StreamTokenizer)operator(.)ident(TT_WORD)(\)) ident(words)operator(++) keyword(else) keyword(if) operator(()ident(st)operator(.)ident(ttype) operator(==) pre_type(StreamTokenizer)operator(.)ident(TT_NUMBER)(\)) ident(numbers)operator(++) @@ -4195,7 +4195,7 @@ comment(// logTailingScript:) ident(sampleInterval) operator(=) integer(2000) comment(// 2000 millis = 2 secs) ident(file) operator(=) keyword(new) pre_type(RandomAccessFile)operator(() ident(logfile)operator(,) string<delimiter(")content(r)delimiter(")> (\)) ident(filePointer) operator(=) integer(0) comment(// set to logfile.size(\) to begin tailing from the end of the file) -keyword(while)operator(() keyword(true) (\)) operator({) +keyword(while)operator(() pre_constant(true) (\)) operator({) comment(// Compare the length of the file to the file pointer) type(long) ident(fileLength) operator(=) ident(logfile)operator(.)ident(size)operator(()(\)) keyword(if)operator(() ident(fileLength) operator(<) ident(filePointer) (\)) operator({) @@ -4207,7 +4207,7 @@ keyword(while)operator(() keyword(true) (\)) operator({) keyword(if)operator(() ident(fileLength) operator(>) ident(filePointer) (\)) operator({) comment(// There is data to read) ident(file)operator(.)ident(seek)operator(() ident(filePointer) (\)) - keyword(while)operator(() operator(()ident(line) operator(=) ident(file)operator(.)ident(readLine)operator(()(\))(\)) operator(!=) keyword(null) (\)) operator({) + keyword(while)operator(() operator(()ident(line) operator(=) ident(file)operator(.)ident(readLine)operator(()(\))(\)) operator(!=) pre_constant(null) (\)) operator({) ident(println) string<delimiter(')content(##)delimiter(')> operator(+) ident(line) (}) ident(filePointer) operator(=) ident(file)operator(.)ident(filePointer) @@ -4258,7 +4258,7 @@ comment(// streaming solution) ident(reader) operator(=) ident(testfile)operator(.)ident(newReader)operator(()(\)) ident(count) operator(=) integer(0) keyword(def) ident(line) -keyword(while) operator(()operator(()ident(line) operator(=) ident(reader)operator(.)ident(readLine)operator(()(\))(\))operator(!=) keyword(null)(\)) operator({) +keyword(while) operator(()operator(()ident(line) operator(=) ident(reader)operator(.)ident(readLine)operator(()(\))(\))operator(!=) pre_constant(null)(\)) operator({) keyword(if) operator(()operator(++)ident(count) operator(==) ident(desiredLine)(\)) keyword(break) (}) ident(println) string<delimiter(")content(Line )inline<inline_delimiter($)ident(desiredLine)>content(: )inline<inline_delimiter($)ident(line)>delimiter(")> @@ -4276,7 +4276,7 @@ comment(// @@PLEAC@@_8.10) comment(//----------------------------------------------------------------------------------) ident(file) operator(=) keyword(new) pre_type(RandomAccessFile)operator(() ident(logfile)operator(,) string<delimiter(")content(rw)delimiter(")> (\)) type(long) ident(previous)operator(,) ident(lastpos) operator(=) integer(0) -keyword(while)operator(() operator(()ident(line) operator(=) ident(file)operator(.)ident(readLine)operator(()(\))(\)) operator(!=) keyword(null) (\)) operator({) +keyword(while)operator(() operator(()ident(line) operator(=) ident(file)operator(.)ident(readLine)operator(()(\))(\)) operator(!=) pre_constant(null) (\)) operator({) ident(previous) operator(=) ident(lastpos) ident(lastpos) operator(=) ident(file)operator(.)ident(filePointer) (}) @@ -4549,7 +4549,7 @@ ident(wtmp) operator(=) keyword(new) pre_type(File)operator(()string<delimiter(' comment(// wtmpTailingScript:) ident(sampleInterval) operator(=) integer(2000) comment(// 2000 millis = 2 secs) ident(filePointer) operator(=) ident(wtmp)operator(.)ident(size)operator(()(\)) comment(// begin tailing from the end of the file) -keyword(while)operator(()keyword(true)(\)) operator({) +keyword(while)operator(()pre_constant(true)(\)) operator({) comment(// Compare the length of the file to the file pointer) type(long) ident(fileLength) operator(=) ident(wtmp)operator(.)ident(size)operator(()(\)) keyword(if)operator(() ident(fileLength) operator(>) ident(filePointer) (\)) operator({) @@ -4582,7 +4582,7 @@ type(class) class(MultiStream) operator({) ident(targets)operator(.)ident(each)operator({) keyword(try) operator({) local_variable(it)operator(?)operator(.)ident(write)operator(()ident(content)operator(.)ident(bytes)(\)) - (}) keyword(catch) operator(()pre_type(Exception) ident(ex)(\)) operator({) + (}) keyword(catch) operator(()exception(Exception) ident(ex)(\)) operator({) keyword(if) operator(()operator(!)ident(ignoreErrors)(\)) keyword(throw) ident(ex) ident(targets) operator(-=) local_variable(it) local_variable(it)operator(?)operator(.)ident(close)operator(()(\)) @@ -4599,7 +4599,7 @@ type(class) class(TeeTarget) operator({) ident(TeeTarget)operator(()pre_type(String) ident(name)operator(,) ident(append)operator(,) ident(buffered)operator(,) ident(ignore)(\)) operator({) keyword(if) operator(()ident(name)operator(.)ident(startsWith)operator(()string<delimiter(')content(>>)delimiter(')>(\))(\)) operator({) - ident(createFileStream)operator(()ident(name)operator([)integer(2)operator(..)operator(-)integer(1)(])operator(,)keyword(true)operator(,)ident(buffered)operator(,)ident(ignore)(\)) + ident(createFileStream)operator(()ident(name)operator([)integer(2)operator(..)operator(-)integer(1)(])operator(,)pre_constant(true)operator(,)ident(buffered)operator(,)ident(ignore)(\)) (}) keyword(else) keyword(if) operator(()ident(name)operator(.)ident(startsWith)operator(()string<delimiter(')content(|)delimiter(')>(\))(\)) operator({) ident(createProcessReader)operator(()ident(name)operator([)integer(1)operator(..)operator(-)integer(1)(])(\)) (}) keyword(else) operator({) @@ -4617,7 +4617,7 @@ type(class) class(TeeTarget) operator({) keyword(def) ident(fos) keyword(try) operator({) ident(fos) operator(=) keyword(new) pre_type(FileOutputStream)operator(()ident(name)operator(,) ident(append)(\)) - (}) keyword(catch) operator(()pre_type(Exception) ident(ex)(\)) operator({) + (}) keyword(catch) operator(()exception(Exception) ident(ex)(\)) operator({) keyword(if) operator(()ident(ignore)(\)) keyword(return) (}) keyword(if) operator(()operator(!)ident(buffered)(\)) ident(stream) operator(=) ident(fos) @@ -4628,7 +4628,7 @@ type(class) class(TeeTarget) operator({) directive(private) ident(createPiperThread)operator(()ident(br)operator(,) ident(pw)(\)) operator({) pre_type(Thread)operator(.)ident(start)operator({) keyword(def) ident(next) - keyword(while)operator(()operator(()ident(next) operator(=) ident(br)operator(.)ident(readLine)operator(()(\))(\))operator(!=)keyword(null)(\)) operator({) + keyword(while)operator(()operator(()ident(next) operator(=) ident(br)operator(.)ident(readLine)operator(()(\))(\))operator(!=)pre_constant(null)(\)) operator({) ident(pw)operator(.)ident(println)operator(()ident(next)(\)) (}) ident(pw)operator(.)ident(flush)operator(()(\))operator(;) ident(pw)operator(.)ident(close)operator(()(\)) @@ -4648,15 +4648,15 @@ type(class) class(TeeTarget) operator({) (}) ident(targets) operator(=) type([]) -ident(append) operator(=) keyword(false)operator(;) ident(ignore) operator(=) keyword(false)operator(;) ident(includeStdout) operator(=) keyword(true)operator(;) ident(buffer) operator(=) keyword(true) +ident(append) operator(=) pre_constant(false)operator(;) ident(ignore) operator(=) pre_constant(false)operator(;) ident(includeStdout) operator(=) pre_constant(true)operator(;) ident(buffer) operator(=) pre_constant(true) operator(()integer(0)operator(..<)ident(args)operator(.)ident(size)operator(()(\))(\))operator(.)ident(each)operator({) ident(arg) operator(=) ident(args)operator([)local_variable(it)(]) keyword(if) operator(()ident(arg)operator(.)ident(startsWith)operator(()string<delimiter(')content(-)delimiter(')>(\))(\)) operator({) keyword(switch) operator(()ident(arg)(\)) operator({) - keyword(case) string<delimiter(')content(-a)delimiter(')>operator(:) ident(append) operator(=) keyword(true)operator(;) keyword(break) - keyword(case) string<delimiter(')content(-i)delimiter(')>operator(:) ident(ignore) operator(=) keyword(true)operator(;) keyword(break) - keyword(case) string<delimiter(')content(-n)delimiter(')>operator(:) ident(includeStdout) operator(=) keyword(false)operator(;) keyword(break) - keyword(case) string<delimiter(')content(-u)delimiter(')>operator(:) ident(buffer) operator(=) keyword(false)operator(;) keyword(break) + keyword(case) string<delimiter(')content(-a)delimiter(')>operator(:) ident(append) operator(=) pre_constant(true)operator(;) keyword(break) + keyword(case) string<delimiter(')content(-i)delimiter(')>operator(:) ident(ignore) operator(=) pre_constant(true)operator(;) keyword(break) + keyword(case) string<delimiter(')content(-n)delimiter(')>operator(:) ident(includeStdout) operator(=) pre_constant(false)operator(;) keyword(break) + keyword(case) string<delimiter(')content(-u)delimiter(')>operator(:) ident(buffer) operator(=) pre_constant(false)operator(;) keyword(break) keyword(default)operator(:) ident(println) string<delimiter(")content(usage: tee [-ainu] [filenames] ...)delimiter(")> pre_type(System)operator(.)ident(exit)operator(()integer(1)(\)) @@ -5148,7 +5148,7 @@ comment(// a shadow forest full of symlinks pointing back at the real files.) comment(// Use Apache Jakarta Commons IO) ident(srcdir) operator(=) keyword(new) pre_type(File)operator(()string<delimiter(')content(Pleac/src)delimiter(')>(\)) comment(// path to src) ident(destdir) operator(=) keyword(new) pre_type(File)operator(()string<delimiter(')content(C:/temp)delimiter(')>(\)) comment(// path to dest) -ident(preserveFileStamps) operator(=) keyword(true) +ident(preserveFileStamps) operator(=) pre_constant(true) ident(FileUtils)operator(.)ident(copyDirectory)operator(()ident(srcdir)operator(,) ident(destdir)operator(,) ident(preserveFileStamps)(\)) comment(//----------------------------------------------------------------------------------) @@ -5352,7 +5352,7 @@ comment(// system over the top. It's still a Java method, just a little bit furt comment(// stack from where we might expect. Getting the Groovy method name can be done in) comment(// an implementation specific way (subject to change as the language evolves\):) keyword(def) method(myMethod)operator(()(\)) operator({) - ident(names) operator(=) keyword(new) pre_type(Exception)operator(()(\))operator(.)ident(stackTrace)operator(*.)ident(methodName) + ident(names) operator(=) keyword(new) exception(Exception)operator(()(\))operator(.)ident(stackTrace)operator(*.)ident(methodName) ident(println) ident(groovyUnwrap)operator(()ident(names)(\)) (}) keyword(def) method(myMethod2)operator(()(\)) operator({) @@ -5570,13 +5570,13 @@ comment(// throw exception to raise it) comment(// When calling methods:) comment(// try ... catch ... finally surrounds processing logic) keyword(def) method(getSizeMostOfTheTime)operator(()ident(s)(\)) operator({) - keyword(if) operator(()ident(s) operator(=~) string<delimiter(')content(Full Moon)delimiter(')>(\)) keyword(throw) keyword(new) pre_type(RuntimeException)operator(()string<delimiter(')content(The world is ending)delimiter(')>(\)) + keyword(if) operator(()ident(s) operator(=~) string<delimiter(')content(Full Moon)delimiter(')>(\)) keyword(throw) keyword(new) exception(RuntimeException)operator(()string<delimiter(')content(The world is ending)delimiter(')>(\)) ident(s)operator(.)ident(size)operator(()(\)) (}) keyword(try) operator({) ident(println) string<delimiter(')content(Size is: )delimiter(')> operator(+) ident(getSizeMostOfTheTime)operator(()string<delimiter(')content(The quick brown fox)delimiter(')>(\)) ident(println) string<delimiter(')content(Size is: )delimiter(')> operator(+) ident(getSizeMostOfTheTime)operator(()string<delimiter(')content(Beware the Full Moon)delimiter(')>(\)) -(}) keyword(catch) operator(()pre_type(Exception) ident(ex)(\)) operator({) +(}) keyword(catch) operator(()exception(Exception) ident(ex)(\)) operator({) ident(println) string<delimiter(")content(Error was: )inline<inline_delimiter($)ident(ex)>content(.message)delimiter(")> (}) keyword(finally) operator({) ident(println) string<delimiter(')content(Doing common cleanup)delimiter(')> @@ -5863,7 +5863,7 @@ ident(println) ident(hash) comment(// => ["KEYNAME":"new value", "a key":[3, 4, 5, 6]]) comment(// attempting to access a value for a key not in the map yields null) -keyword(assert) ident(hash)operator([)string<delimiter(')content(unknown key)delimiter(')>(]) operator(==) keyword(null) +keyword(assert) ident(hash)operator([)string<delimiter(')content(unknown key)delimiter(')>(]) operator(==) pre_constant(null) keyword(assert) ident(hash)operator(.)ident(get)operator(()string<delimiter(')content(unknown key)delimiter(')>operator(,) integer(45)(\)) operator(==) integer(45) ident(println) ident(hash) comment(// => ["unknown key":45, "KEYNAME":"new value", "a key":[3, 4, 5, 6]]) @@ -6130,7 +6130,7 @@ keyword(new) pre_type(File)operator(()string<delimiter(')content(months.dat)deli ident(oos)operator(.)ident(writeObject)operator(()ident(map)(\)) (}) comment(// reset) -ident(map) operator(=) keyword(null) +ident(map) operator(=) pre_constant(null) comment(// read) keyword(new) pre_type(File)operator(()string<delimiter(')content(months.dat)delimiter(')>(\))operator(.)ident(withObjectInputStream)operator({) ident(ois) operator(->) ident(map) operator(=) ident(ois)operator(.)ident(readObject)operator(()(\)) @@ -6301,7 +6301,7 @@ keyword(for) operator(()ident(i) keyword(in) integer(0)operator(..)integer(1000) (}) ident(println) ident(hash)operator([)integer(750)(]) comment(// => 1500) -ident(store) operator(=) keyword(null)operator(;) ident(hash) operator(=) keyword(null) comment(// *** could shutdown here) +ident(store) operator(=) pre_constant(null)operator(;) ident(hash) operator(=) pre_constant(null) comment(// *** could shutdown here) ident(store) operator(=) ident(PrevaylerFactory)operator(.)ident(createPrevayler)operator(()keyword(new) ident(ImportantHash)operator(()(\))operator(,) string<delimiter(")content(pleac11)delimiter(")>(\)) ident(hash) operator(=) ident(store)operator(.)ident(prevalentSystem)operator(()(\)) @@ -6316,8 +6316,8 @@ type(class) class(BinaryTree) operator({) keyword(def) ident(value)operator(,) ident(left)operator(,) ident(right) ident(BinaryTree)operator(()ident(val)(\)) operator({) ident(value) operator(=) ident(val) - ident(left) operator(=) keyword(null) - ident(right) operator(=) keyword(null) + ident(left) operator(=) pre_constant(null) + ident(right) operator(=) pre_constant(null) (}) comment(// insert given value into proper point of) @@ -6378,9 +6378,9 @@ type(class) class(BinaryTree) operator({) keyword(if) operator(()ident(val) operator(==) ident(value)(\)) operator({) keyword(return) local_variable(this)operator(.)ident(dump)operator(()(\)) (}) keyword(else) keyword(if) operator(()ident(val) operator(<) ident(value)(\)) operator({) - keyword(return) ident(left) operator(?) ident(left)operator(.)ident(search)operator(()ident(val)(\)) operator(:) keyword(null) + keyword(return) ident(left) operator(?) ident(left)operator(.)ident(search)operator(()ident(val)(\)) operator(:) pre_constant(null) (}) keyword(else) operator({) - keyword(return) ident(right) operator(?) ident(right)operator(.)ident(search)operator(()ident(val)(\)) operator(:) keyword(null) + keyword(return) ident(right) operator(?) ident(right)operator(.)ident(search)operator(()ident(val)(\)) operator(:) pre_constant(null) (}) (}) (}) @@ -6398,7 +6398,7 @@ ident(print) string<delimiter(")content(In order: )delimiter(")>operator(;) id ident(print) string<delimiter(")content(Post order: )delimiter(")>operator(;) ident(test)operator(.)ident(postOrder)operator(()(\))operator(;) ident(println) string<delimiter(")delimiter(")> ident(println) string<delimiter(")char(\\n)content(Search?)delimiter(")> -keyword(while) operator(()operator(()ident(item) operator(=) pre_type(System)operator(.)ident(in)operator(.)ident(readLine)operator(()(\))operator(?)operator(.)ident(trim)operator(()(\))(\)) operator(!=) keyword(null)(\)) operator({) +keyword(while) operator(()operator(()ident(item) operator(=) pre_type(System)operator(.)ident(in)operator(.)ident(readLine)operator(()(\))operator(?)operator(.)ident(trim)operator(()(\))(\)) operator(!=) pre_constant(null)(\)) operator({) ident(println) ident(test)operator(.)ident(search)operator(()ident(item)operator(.)ident(toInteger)operator(()(\))(\)) ident(println) string<delimiter(")char(\\n)content(Search?)delimiter(")> (}) @@ -6489,7 +6489,7 @@ comment(// using the normal exception handling mechanisms.) comment(// attempt to load an unknown resource or script:) keyword(try) operator({) ident(evaluate)operator(()keyword(new) pre_type(File)operator(()string<delimiter(')content(doesnotexist.groovy)delimiter(')>(\))(\)) -(}) keyword(catch) operator(()pre_type(Exception) pre_type(FileNotFoundException)(\)) operator({) +(}) keyword(catch) operator(()exception(Exception) exception(FileNotFoundException)(\)) operator({) ident(println) string<delimiter(')content(File not found, skipping ...)delimiter(')> (}) comment(// => File not found, skipping ...) @@ -6497,7 +6497,7 @@ comment(// => File not found, skipping ...) comment(// attempt to load an unknown class:) keyword(try) operator({) pre_type(Class)operator(.)ident(forName)operator(()string<delimiter(')content(org.happytimes.LottoNumberGenerator)delimiter(')>(\)) -(}) keyword(catch) operator(()pre_type(ClassNotFoundException) ident(ex)(\)) operator({) +(}) keyword(catch) operator(()exception(ClassNotFoundException) ident(ex)(\)) operator({) ident(println) string<delimiter(')content(Class not found, skipping ...)delimiter(')> (}) comment(// -> Class not found, skipping ...) @@ -6522,12 +6522,12 @@ ident(candidates) operator(=) operator([) string<delimiter(')content(org.firebirdsql.jdbc.FBDriver)delimiter(')>operator(,) string<delimiter(')content(sun.jdbc.odbc.JdbcOdbcDriver)delimiter(')> (]) -ident(loaded) operator(=) keyword(null) +ident(loaded) operator(=) pre_constant(null) keyword(for) operator(()ident(driver) keyword(in) ident(candidates)(\)) operator({) keyword(try) operator({) ident(loaded) operator(=) pre_type(Class)operator(.)ident(forName)operator(()ident(driver)(\))operator(.)ident(newInstance)operator(()(\)) keyword(break) - (}) keyword(catch) operator(()pre_type(Exception) ident(ex)(\)) operator({) comment(/* ignore */) (}) + (}) keyword(catch) operator(()exception(Exception) ident(ex)(\)) operator({) comment(/* ignore */) (}) (}) ident(println) ident(loaded)operator(?)operator(.)ident(class)operator(?)operator(.)ident(name) comment(// => sun.jdbc.odbc.JdbcOdbcDriver) comment(//----------------------------------------------------------------------------------) @@ -6881,7 +6881,7 @@ type(class) class(Person) operator({) directive(private) ident(alive) comment(// object constructor) - ident(Person)operator(()ident(age)operator(,) ident(name)operator(,) ident(alive) operator(=) keyword(true)(\)) operator({) comment(// Default arg like in C++) + ident(Person)operator(()ident(age)operator(,) ident(name)operator(,) ident(alive) operator(=) pre_constant(true)(\)) operator({) comment(// Default arg like in C++) local_variable(this)operator(.)ident(age) operator(=) ident(age) local_variable(this)operator(.)ident(name) operator(=) ident(name) local_variable(this)operator(.)ident(alive) operator(=) ident(alive) @@ -6890,7 +6890,7 @@ type(class) class(Person) operator({) (}) keyword(def) method(die)operator(()(\)) operator({) - ident(alive) operator(=) keyword(false) + ident(alive) operator(=) pre_constant(false) ident(println) string<delimiter(")inline<inline_delimiter($)ident(name)>content( has died at the age of )inline<inline_delimiter($)ident(age)>content(.)delimiter(")> ident(alive) (}) @@ -6921,8 +6921,8 @@ type(class) class(Person) operator({) comment(// Using the class:) comment(// Create objects of class Person) ident(lecter) operator(=) keyword(new) ident(Person)operator(()integer(47)operator(,) string<delimiter(')content(Hannibal)delimiter(')>(\)) -ident(starling) operator(=) keyword(new) ident(Person)operator(()integer(29)operator(,) string<delimiter(')content(Clarice)delimiter(')>operator(,) keyword(true)(\)) -ident(pazzi) operator(=) keyword(new) ident(Person)operator(()integer(40)operator(,) string<delimiter(')content(Rinaldo)delimiter(')>operator(,) keyword(true)(\)) +ident(starling) operator(=) keyword(new) ident(Person)operator(()integer(29)operator(,) string<delimiter(')content(Clarice)delimiter(')>operator(,) pre_constant(true)(\)) +ident(pazzi) operator(=) keyword(new) ident(Person)operator(()integer(40)operator(,) string<delimiter(')content(Rinaldo)delimiter(')>operator(,) pre_constant(true)(\)) comment(// Calling a class method) ident(println) string<delimiter(")content(There are )inline<inline_delimiter($)ident(Person)>content(.numberOfPeople Person objects.)delimiter(")> @@ -7097,9 +7097,9 @@ type(class) class(ValidatingPerson) operator({) keyword(def) method(printAge)operator(()(\)) operator({) ident(println) string<delimiter(')content(Age=)delimiter(')> operator(+) ident(age) (}) keyword(def) method(setAge)operator(()ident(value)(\)) operator({) keyword(if) operator(()operator(!)operator(()ident(value) keyword(instanceof) pre_type(Integer)(\))(\)) - keyword(throw) keyword(new) pre_type(IllegalArgumentException)operator(()string<delimiter(")content(Argument ')inline<inline_delimiter(${)ident(value)inline_delimiter(})>content(' isn't an Integer)delimiter(")>(\)) + keyword(throw) keyword(new) exception(IllegalArgumentException)operator(()string<delimiter(")content(Argument ')inline<inline_delimiter(${)ident(value)inline_delimiter(})>content(' isn't an Integer)delimiter(")>(\)) keyword(if) operator(()ident(value) operator(>) integer(150)(\)) - keyword(throw) keyword(new) pre_type(IllegalArgumentException)operator(()string<delimiter(")content(Age )inline<inline_delimiter(${)ident(value)inline_delimiter(})>content( is unreasonable)delimiter(")>(\)) + keyword(throw) keyword(new) exception(IllegalArgumentException)operator(()string<delimiter(")content(Age )inline<inline_delimiter(${)ident(value)inline_delimiter(})>content( is unreasonable)delimiter(")>(\)) ident(age) operator(=) ident(value) (}) (}) @@ -7108,7 +7108,7 @@ comment(// test ValidatingPerson) keyword(def) method(tryCreate)operator(()ident(arg)(\)) operator({) keyword(try) operator({) keyword(new) ident(ValidatingPerson)operator(()key(age)operator(:)ident(arg)(\))operator(.)ident(printAge)operator(()(\)) - (}) keyword(catch) operator(()pre_type(Exception) ident(ex)(\)) operator({) + (}) keyword(catch) operator(()exception(Exception) ident(ex)(\)) operator({) ident(println) ident(ex)operator(.)ident(message) (}) (}) @@ -7675,15 +7675,15 @@ comment(// JDBC or Datasets would normally be most common for all examples in th comment(// Example shown using berkeley db Java edition - not quite as transparent as) comment(// cookbook example as Berkeley DB Java addition makes transactions visible.) keyword(import) include(com.sleepycat.je.*) -ident(tx) operator(=) keyword(null) +ident(tx) operator(=) pre_constant(null) ident(envHome) operator(=) keyword(new) pre_type(File)operator(()string<delimiter(")content(D:/Projects/GroovyExamples/Pleac/data/db)delimiter(")>(\)) ident(myEnvConfig) operator(=) keyword(new) ident(EnvironmentConfig)operator(()(\)) -ident(myEnvConfig)operator(.)ident(setAllowCreate)operator(()keyword(true)(\)) +ident(myEnvConfig)operator(.)ident(setAllowCreate)operator(()pre_constant(true)(\)) ident(myEnv) operator(=) keyword(new) ident(Environment)operator(()ident(envHome)operator(,) ident(myEnvConfig)(\)) ident(myDbConfig) operator(=) keyword(new) ident(DatabaseConfig)operator(()(\)) -ident(myDbConfig)operator(.)ident(setAllowCreate)operator(()keyword(true)(\)) +ident(myDbConfig)operator(.)ident(setAllowCreate)operator(()pre_constant(true)(\)) ident(myDb) operator(=) ident(myEnv)operator(.)ident(openDatabase)operator(()ident(tx)operator(,) string<delimiter(")content(vendorDB)delimiter(")>operator(,) ident(myDbConfig)(\)) ident(theKey) operator(=) keyword(new) ident(DatabaseEntry)operator(()string<delimiter(")content(key)delimiter(")>operator(.)ident(getBytes)operator(()string<delimiter(")content(UTF-8)delimiter(")>(\))(\)) @@ -7758,15 +7758,15 @@ comment(// @@PLEAC@@_14.2) comment(//----------------------------------------------------------------------------------) comment(// Groovy would normally use JDBC here (see 14.1 for details\)) keyword(import) include(com.sleepycat.je.*) -ident(tx) operator(=) keyword(null) +ident(tx) operator(=) pre_constant(null) ident(envHome) operator(=) keyword(new) pre_type(File)operator(()string<delimiter(")content(D:/Projects/GroovyExamples/Pleac/data/db)delimiter(")>(\)) ident(myEnvConfig) operator(=) keyword(new) ident(EnvironmentConfig)operator(()(\)) -ident(myEnvConfig)operator(.)ident(setAllowCreate)operator(()keyword(true)(\)) +ident(myEnvConfig)operator(.)ident(setAllowCreate)operator(()pre_constant(true)(\)) ident(myEnv) operator(=) keyword(new) ident(Environment)operator(()ident(envHome)operator(,) ident(myEnvConfig)(\)) ident(myDbConfig) operator(=) keyword(new) ident(DatabaseConfig)operator(()(\)) -ident(myDbConfig)operator(.)ident(setAllowCreate)operator(()keyword(true)(\)) +ident(myDbConfig)operator(.)ident(setAllowCreate)operator(()pre_constant(true)(\)) ident(myDb) operator(=) ident(myEnv)operator(.)ident(openDatabase)operator(()ident(tx)operator(,) string<delimiter(")content(vendorDB)delimiter(")>operator(,) ident(myDbConfig)(\)) ident(theKey) operator(=) keyword(new) ident(DatabaseEntry)operator(()string<delimiter(")content(key)delimiter(")>operator(.)ident(getBytes)operator(()string<delimiter(")content(UTF-8)delimiter(")>(\))(\)) @@ -7774,7 +7774,7 @@ ident(theData) operator(=) keyword(new) ident(DatabaseEntry)operator(()string<de ident(myDb)operator(.)ident(put)operator(()ident(tx)operator(,) ident(theKey)operator(,) ident(theData)(\)) ident(myDb)operator(.)ident(close)operator(()(\)) comment(// clear out database) -ident(returnCount) operator(=) keyword(true) +ident(returnCount) operator(=) pre_constant(true) ident(println) ident(myEnv)operator(.)ident(truncateDatabase)operator(()ident(tx)operator(,) string<delimiter(")content(vendorDB)delimiter(")>operator(,) ident(returnCount)(\)) operator(+) string<delimiter(')content( records deleted)delimiter(')> comment(// remove database) ident(myEnv)operator(.)ident(removeDatabase)operator(()ident(tx)operator(,) string<delimiter(")content(vendorDB)delimiter(")>(\)) @@ -7829,21 +7829,21 @@ comment(// Groovy would normally use JDBC here (see 14.1 for details\)) keyword(import) include(com.sleepycat.je.*) keyword(def) method(copyEntries)operator(()ident(indb)operator(,) ident(outdb)(\)) operator({) - ident(cursor) operator(=) ident(indb1)operator(.)ident(openCursor)operator(()keyword(null)operator(,) keyword(null)(\)) + ident(cursor) operator(=) ident(indb1)operator(.)ident(openCursor)operator(()pre_constant(null)operator(,) pre_constant(null)(\)) keyword(while) operator(()ident(cursor)operator(.)ident(getNext)operator(()ident(foundKey)operator(,) ident(foundData)operator(,) ident(LockMode)operator(.)ident(DEFAULT)(\)) operator(==) ident(OperationStatus)operator(.)ident(SUCCESS)(\)) ident(outdb)operator(.)ident(out)operator(()ident(tx)operator(,) ident(foundKey)operator(,) ident(foundData)(\)) ident(cursor)operator(.)ident(close)operator(()(\)) (}) -ident(tx) operator(=) keyword(null) +ident(tx) operator(=) pre_constant(null) ident(envHome) operator(=) keyword(new) pre_type(File)operator(()string<delimiter(")content(D:/Projects/GroovyExamples/Pleac/data/db)delimiter(")>(\)) ident(myEnvConfig) operator(=) keyword(new) ident(EnvironmentConfig)operator(()(\)) -ident(myEnvConfig)operator(.)ident(setAllowCreate)operator(()keyword(true)(\)) +ident(myEnvConfig)operator(.)ident(setAllowCreate)operator(()pre_constant(true)(\)) ident(myEnv) operator(=) keyword(new) ident(Environment)operator(()ident(envHome)operator(,) ident(myEnvConfig)(\)) ident(myDbConfig) operator(=) keyword(new) ident(DatabaseConfig)operator(()(\)) -ident(myDbConfig)operator(.)ident(setAllowCreate)operator(()keyword(true)(\)) +ident(myDbConfig)operator(.)ident(setAllowCreate)operator(()pre_constant(true)(\)) ident(indb1) operator(=) ident(myEnv)operator(.)ident(openDatabase)operator(()ident(tx)operator(,) string<delimiter(")content(db1)delimiter(")>operator(,) ident(myDbConfig)(\)) ident(indb2) operator(=) ident(myEnv)operator(.)ident(openDatabase)operator(()ident(tx)operator(,) string<delimiter(")content(db2)delimiter(")>operator(,) ident(myDbConfig)(\)) ident(outdb) operator(=) ident(myEnv)operator(.)ident(openDatabase)operator(()ident(tx)operator(,) string<delimiter(")content(db3)delimiter(")>operator(,) ident(myDbConfig)(\)) @@ -7851,7 +7851,7 @@ ident(foundKey) operator(=) keyword(new) ident(DatabaseEntry)operator(()(\)) ident(foundData) operator(=) keyword(new) ident(DatabaseEntry)operator(()(\)) ident(copyEntries)operator(()ident(indb1)operator(,) ident(outdb)(\)) ident(copyEntries)operator(()ident(indb2)operator(,) ident(outdb)(\)) -ident(cursor) operator(=) ident(indb2)operator(.)ident(openCursor)operator(()keyword(null)operator(,) keyword(null)(\)) +ident(cursor) operator(=) ident(indb2)operator(.)ident(openCursor)operator(()pre_constant(null)operator(,) pre_constant(null)(\)) keyword(while) operator(()ident(cursor)operator(.)ident(getNext)operator(()ident(foundKey)operator(,) ident(foundData)operator(,) ident(LockMode)operator(.)ident(DEFAULT)(\)) operator(==) ident(OperationStatus)operator(.)ident(SUCCESS)(\)) ident(outdb)operator(.)ident(out)operator(()ident(tx)operator(,) ident(foundKey)operator(,) ident(foundData)(\)) ident(cursor)operator(.)ident(close)operator(()(\)) @@ -8164,7 +8164,7 @@ comment(// 'barchart' example) keyword(import) include(jcurses.system.Toolkit) ident(numCols) operator(=) pre_type(Toolkit)operator(.)ident(screenWidth) ident(rand) operator(=) keyword(new) pre_type(Random)operator(()(\)) -keyword(if) operator(()ident(numCols) operator(<) integer(20)(\)) keyword(throw) keyword(new) pre_type(RuntimeException)operator(()string<delimiter(")content(You must have at least 20 characters)delimiter(")>(\)) +keyword(if) operator(()ident(numCols) operator(<) integer(20)(\)) keyword(throw) keyword(new) exception(RuntimeException)operator(()string<delimiter(")content(You must have at least 20 characters)delimiter(")>(\)) ident(values) operator(=) operator(()integer(1)operator(..)integer(5)(\))operator(.)ident(collect) operator({) ident(rand)operator(.)ident(nextInt)operator(()integer(20)(\)) (}) comment(// generate rand values) ident(max) operator(=) ident(values)operator(.)ident(max)operator(()(\)) ident(ratio) operator(=) operator(()ident(numCols) operator(-) integer(12)(\))operator(/)ident(max) @@ -8314,8 +8314,8 @@ ident(maxcol) operator(=) pre_type(Toolkit)operator(.)ident(screenWidth) ident(maxrow) operator(=) pre_type(Toolkit)operator(.)ident(screenHeight) ident(colors) operator(=) operator([)ident(CharColor)operator(.)ident(WHITE)operator(,) ident(CharColor)operator(.)ident(CYAN)operator(,) ident(CharColor)operator(.)ident(YELLOW)operator(,) ident(CharColor)operator(.)ident(GREEN)operator(,) ident(CharColor)operator(.)ident(RED)operator(,) ident(CharColor)operator(.)ident(BLUE)operator(,) ident(CharColor)operator(.)ident(MAGENTA)operator(,) ident(CharColor)operator(.)ident(BLACK)(]) -ident(done) operator(=) keyword(false) -ident(refresh) operator(=) keyword(false) +ident(done) operator(=) pre_constant(false) +ident(refresh) operator(=) pre_constant(false) ident(waittime) operator(=) integer(8000) ident(oldlines) operator(=) type([]) keyword(def) method(fade)operator(()ident(line)operator(,) ident(row)operator(,) ident(colorList)(\)) operator({) @@ -8336,7 +8336,7 @@ keyword(while)operator(()operator(!)ident(done)(\)) operator({) (}) (}) ident(oldlines) operator(=) ident(lines) - ident(refresh) operator(=) keyword(false) + ident(refresh) operator(=) pre_constant(false) ident(waittime) operator(=) integer(0) (}) ident(waittime) operator(+=) integer(200) @@ -8348,8 +8348,8 @@ comment(// Something like below but need to synchronize as we are in different t pre_type(Thread)operator(.)ident(start)operator({) keyword(while)operator(()operator(!)ident(done)(\)) operator({) ident(ch) operator(=) pre_type(Toolkit)operator(.)ident(readCharacter)operator(()(\)) - keyword(if) operator(()ident(ch)operator(.)ident(isSpecialCode)operator(()(\)) operator(||) ident(ch)operator(.)ident(character) operator(==) string<delimiter(')content(q)delimiter(')>(\)) ident(done) operator(=) keyword(true) - keyword(else) ident(refresh) operator(=) keyword(true) + keyword(if) operator(()ident(ch)operator(.)ident(isSpecialCode)operator(()(\)) operator(||) ident(ch)operator(.)ident(character) operator(==) string<delimiter(')content(q)delimiter(')>(\)) ident(done) operator(=) pre_constant(true) + keyword(else) ident(refresh) operator(=) pre_constant(true) (}) (}) comment(//----------------------------------------------------------------------------------) @@ -8392,18 +8392,18 @@ ident(frame) operator(=) keyword(new) ident(SwingBuilder)operator(()(\))operator ident(menuItem) operator(()key(actionPerformed)operator(:)operator({)pre_type(System)operator(.)ident(exit)operator(()integer(0)(\))(})operator(,) string<delimiter(')content(Quit immediately)delimiter(')>(\)) (}) ident(menu)operator(()key(mnemonic)operator(:)string<delimiter(')content(O)delimiter(')>operator(,) string<delimiter(')content(Options)delimiter(')>(\)) operator({) - ident(checkBoxMenuItem) operator(()string<delimiter(')content(Create Debugging Info)delimiter(')>operator(,) key(state)operator(:)keyword(true)(\)) + ident(checkBoxMenuItem) operator(()string<delimiter(')content(Create Debugging Info)delimiter(')>operator(,) key(state)operator(:)pre_constant(true)(\)) (}) ident(menu)operator(()key(mnemonic)operator(:)string<delimiter(')content(D)delimiter(')>operator(,) string<delimiter(')content(Debug)delimiter(')>(\)) operator({) ident(group) operator(=) ident(buttonGroup)operator(()(\)) - ident(radioButtonMenuItem) operator(()string<delimiter(')content(Log Level 1)delimiter(')>operator(,) key(buttonGroup)operator(:)ident(group)operator(,) key(selected)operator(:)keyword(true)(\)) + ident(radioButtonMenuItem) operator(()string<delimiter(')content(Log Level 1)delimiter(')>operator(,) key(buttonGroup)operator(:)ident(group)operator(,) key(selected)operator(:)pre_constant(true)(\)) ident(radioButtonMenuItem) operator(()string<delimiter(')content(Log Level 2)delimiter(')>operator(,) key(buttonGroup)operator(:)ident(group)(\)) ident(radioButtonMenuItem) operator(()string<delimiter(')content(Log Level 3)delimiter(')>operator(,) key(buttonGroup)operator(:)ident(group)(\)) (}) ident(menu)operator(()key(mnemonic)operator(:)string<delimiter(')content(F)delimiter(')>operator(,) string<delimiter(')content(Format)delimiter(')>(\)) operator({) ident(menu)operator(()string<delimiter(')content(Font)delimiter(')>(\)) operator({) ident(group) operator(=) ident(buttonGroup)operator(()(\)) - ident(radioButtonMenuItem) operator(()string<delimiter(')content(Times Roman)delimiter(')>operator(,) key(buttonGroup)operator(:)ident(group)operator(,) key(selected)operator(:)keyword(true)(\)) + ident(radioButtonMenuItem) operator(()string<delimiter(')content(Times Roman)delimiter(')>operator(,) key(buttonGroup)operator(:)ident(group)operator(,) key(selected)operator(:)pre_constant(true)(\)) ident(radioButtonMenuItem) operator(()string<delimiter(')content(Courier)delimiter(')>operator(,) key(buttonGroup)operator(:)ident(group)(\)) (}) (}) @@ -8477,7 +8477,7 @@ keyword(import) include(javax.swing.JOptionPane) keyword(def) method(calculate)operator(()ident(event)(\)) operator({) keyword(try) operator({) ident(swing)operator(.)ident(result)operator(.)ident(text) operator(=) ident(evaluate)operator(()ident(swing)operator(.)ident(expr)operator(.)ident(text)(\)) - (}) keyword(catch) operator(()pre_type(Exception) ident(ex)(\)) operator({) + (}) keyword(catch) operator(()exception(Exception) ident(ex)(\)) operator({) pre_type(JOptionPane)operator(.)ident(showMessageDialog)operator(()ident(frame)operator(,) ident(ex)operator(.)ident(message)(\)) (}) (}) @@ -8547,7 +8547,7 @@ ident(chars) operator(=) string<delimiter(')content(*-/|)char(\\\\)content(_)del ident(colors) operator(=) operator([)ident(CharColor)operator(.)ident(RED)operator(,) ident(CharColor)operator(.)ident(BLUE)operator(,) ident(CharColor)operator(.)ident(YELLOW)operator(,) ident(CharColor)operator(.)ident(GREEN)operator(,) ident(CharColor)operator(.)ident(CYAN)operator(,) ident(CharColor)operator(.)ident(MAGENTA)(]) ident(delay) operator(=) integer(20) -ident(ch) operator(=) keyword(null) +ident(ch) operator(=) pre_constant(null) keyword(def) method(nextChar)operator(()(\))operator({) ident(ch) operator(=) ident(chars)operator([)integer(0)(]) ident(chars) operator(=) ident(chars)operator([)integer(1)operator(..)operator(-)integer(1)(]) operator(+) ident(chars)operator([)integer(0)(]) @@ -8555,7 +8555,7 @@ keyword(def) method(nextChar)operator(()(\))operator({) ident(colors) operator(=) ident(colors)operator([)integer(1)operator(..)operator(-)integer(1)(]) operator(+) ident(colors)operator([)integer(0)(]) (}) ident(nextChar)operator(()(\)) -keyword(while)operator(()keyword(true)(\)) operator({) +keyword(while)operator(()pre_constant(true)(\)) operator({) pre_type(Toolkit)operator(.)ident(printString)operator(()ident(ch)operator(,) ident(row)operator(,) ident(col)operator(,) ident(color)(\)) ident(sleep) ident(delay) ident(row) operator(=) ident(row) operator(+) ident(rowinc) @@ -8603,7 +8603,7 @@ type(class) class(DragDropList) directive(extends) pre_type(JList) directive(imp (}) directive(public) type(void) ident(dragDropEnd)operator(()pre_type(DragSourceDropEvent) ident(dsde)(\)) operator({) - ident(dropTargetCell) operator(=) keyword(null) + ident(dropTargetCell) operator(=) pre_constant(null) ident(draggedIndex) operator(=) operator(-)integer(1) ident(repaint)operator(()(\)) (}) @@ -8628,7 +8628,7 @@ type(class) class(DragDropList) directive(extends) pre_type(JList) directive(imp directive(public) type(void) ident(dragOver)operator(()pre_type(DropTargetDragEvent) ident(dtde)(\)) operator({) keyword(if) operator(()ident(dtde)operator(.)ident(source) operator(!=) ident(dropTarget)(\)) ident(dtde)operator(.)ident(rejectDrag)operator(()(\)) type(int) ident(index) operator(=) ident(locationToIndex)operator(()ident(dtde)operator(.)ident(location)(\)) - keyword(if) operator(()ident(index) operator(==) operator(-)integer(1) operator(||) ident(index) operator(==) ident(draggedIndex) operator(+) integer(1)(\)) ident(dropTargetCell) operator(=) keyword(null) + keyword(if) operator(()ident(index) operator(==) operator(-)integer(1) operator(||) ident(index) operator(==) ident(draggedIndex) operator(+) integer(1)(\)) ident(dropTargetCell) operator(=) pre_constant(null) keyword(else) ident(dropTargetCell) operator(=) ident(model)operator(.)ident(getElementAt)operator(()ident(index)(\)) ident(repaint)operator(()(\)) (}) @@ -8648,7 +8648,7 @@ type(class) class(DragDropList) directive(extends) pre_type(JList) directive(imp type(boolean) ident(sourceBeforeTarget) operator(=) operator(()ident(draggedIndex) operator(<) ident(index)(\)) ident(model)operator(.)ident(remove)operator(()ident(draggedIndex)(\)) ident(model)operator(.)ident(add)operator(()operator(()ident(sourceBeforeTarget) operator(?) ident(index) operator(-) integer(1) operator(:) ident(index)(\))operator(,) ident(dragged)(\)) - ident(dtde)operator(.)ident(dropComplete)operator(()keyword(true)(\)) + ident(dtde)operator(.)ident(dropComplete)operator(()pre_constant(true)(\)) (}) (}) @@ -8714,7 +8714,7 @@ keyword(def) ident(frame) operator(=) keyword(new) pre_type(JFrame)operator(()st ident(frame)operator(.)ident(setDefaultCloseOperation)operator(()pre_type(WindowConstants)operator(.)ident(EXIT_ON_CLOSE)(\)) ident(frame)operator(.)ident(contentPane)operator(.)ident(add)operator(()ident(sp)(\)) ident(frame)operator(.)ident(pack)operator(()(\)) -ident(frame)operator(.)ident(setVisible)operator(()keyword(true)(\)) +ident(frame)operator(.)ident(setVisible)operator(()pre_constant(true)(\)) comment(//----------------------------------------------------------------------------------) @@ -8769,7 +8769,7 @@ ident(reader) operator(=) keyword(new) pre_type(BufferedReader)operator(()keywor pre_type(System)operator(.)ident(setOut)operator(()keyword(new) pre_type(PrintStream)operator(()keyword(new) pre_type(BufferedOutputStream)operator(()keyword(new) pre_type(PipedOutputStream)operator(()ident(pipe)(\))(\))(\))(\)) type(int) ident(numlines) operator(=) integer(2) pre_type(Thread)operator(.)ident(start)operator({) - keyword(while)operator(()operator(()ident(next) operator(=) ident(reader)operator(.)ident(readLine)operator(()(\))(\)) operator(!=) keyword(null)(\)) operator({) + keyword(while)operator(()operator(()ident(next) operator(=) ident(reader)operator(.)ident(readLine)operator(()(\))(\)) operator(!=) pre_constant(null)(\)) operator({) keyword(if) operator(()ident(numlines)operator(--) operator(>) integer(0)(\)) ident(keep)operator(.)ident(println)operator(()ident(next)(\)) (}) (}) @@ -8798,7 +8798,7 @@ type(class) class(FilterOutput) directive(extends) pre_type(Thread) operator({) (}) type(void) ident(run)operator(()(\)) operator({) keyword(def) ident(next) - keyword(while)operator(()operator(()ident(next) operator(=) ident(reader)operator(.)ident(readLine)operator(()(\))(\)) operator(!=) keyword(null)(\)) operator({) + keyword(while)operator(()operator(()ident(next) operator(=) ident(reader)operator(.)ident(readLine)operator(()(\))(\)) operator(!=) pre_constant(null)(\)) operator({) ident(c)operator(()ident(orig)operator(,) ident(next)(\)) (}) (}) @@ -8878,7 +8878,7 @@ ident(proc2) operator(=) string<delimiter(')content(groovy -e "print System.in.t pre_type(Thread)operator(.)ident(start)operator({) keyword(def) ident(reader) operator(=) keyword(new) pre_type(BufferedReader)operator(()keyword(new) pre_type(InputStreamReader)operator(()ident(proc1)operator(.)ident(in)(\))(\)) keyword(def) ident(writer) operator(=) keyword(new) pre_type(PrintWriter)operator(()keyword(new) pre_type(BufferedOutputStream)operator(()ident(proc2)operator(.)ident(out)(\))(\)) - keyword(while) operator(()operator(()ident(next) operator(=) ident(reader)operator(.)ident(readLine)operator(()(\))(\)) operator(!=) keyword(null)(\)) operator({) + keyword(while) operator(()operator(()ident(next) operator(=) ident(reader)operator(.)ident(readLine)operator(()(\))(\)) operator(!=) pre_constant(null)(\)) operator({) ident(writer)operator(.)ident(println)operator(()ident(next)(\)) (}) ident(writer)operator(.)ident(close)operator(()(\)) @@ -8956,7 +8956,7 @@ keyword(import) include(org.garret.jipc.client.JIPCClientFactory) ident(port) operator(=) integer(6000) ident(factory) operator(=) ident(JIPCClientFactory)operator(.)ident(instance) ident(session) operator(=) ident(factory)operator(.)ident(create)operator(()string<delimiter(')content(localhost)delimiter(')>operator(,) ident(port)(\)) -ident(mutex) operator(=) ident(session)operator(.)ident(createMutex)operator(()string<delimiter(")content(myMutex)delimiter(")>operator(,) keyword(false)(\)) +ident(mutex) operator(=) ident(session)operator(.)ident(createMutex)operator(()string<delimiter(")content(myMutex)delimiter(")>operator(,) pre_constant(false)(\)) ident(buffer) operator(=) ident(session)operator(.)ident(createSharedMemory)operator(()string<delimiter(")content(myBuffer)delimiter(")>operator(,) string<delimiter(")content(not yet set)delimiter(")>(\)) ident(name) operator(=) ident(args)operator([)integer(0)(]) ident(rand) operator(=) keyword(new) pre_type(Random)operator(()(\)) @@ -8973,7 +8973,7 @@ keyword(import) include(org.garret.jipc.client.JIPCClientFactory) ident(port) operator(=) integer(6000) ident(factory) operator(=) ident(JIPCClientFactory)operator(.)ident(instance) ident(session) operator(=) ident(factory)operator(.)ident(create)operator(()string<delimiter(')content(localhost)delimiter(')>operator(,) ident(port)(\)) -ident(mutex) operator(=) ident(session)operator(.)ident(createMutex)operator(()string<delimiter(")content(myMutex)delimiter(")>operator(,) keyword(false)(\)) +ident(mutex) operator(=) ident(session)operator(.)ident(createMutex)operator(()string<delimiter(")content(myMutex)delimiter(")>operator(,) pre_constant(false)(\)) ident(buffer) operator(=) ident(session)operator(.)ident(createSharedMemory)operator(()string<delimiter(")content(myBuffer)delimiter(")>operator(,) string<delimiter(")content(not yet set)delimiter(")>(\)) ident(rand) operator(=) keyword(new) pre_type(Random)operator(()(\)) operator(()integer(0)operator(..)integer(299)(\))operator(.)ident(each) operator({) @@ -9026,7 +9026,7 @@ XFSZ WAITING LWP AIO IO INFO THR BREAK FREEZE THAW CANCEL EMT ident(sigs)operator(.)ident(tokenize)operator(()string<delimiter(')content( \\n)delimiter(')>(\))operator(.)ident(each)operator({) keyword(try) operator({) ident(print) string<delimiter(')content( )delimiter(')> operator(+) keyword(new) ident(sun)operator(.)ident(misc)operator(.)ident(Signal)operator(()local_variable(it)(\)) - (}) keyword(catch)operator(()pre_type(IllegalArgumentException) ident(iae)(\)) operator({)(}) + (}) keyword(catch)operator(()exception(IllegalArgumentException) ident(iae)(\)) operator({)(}) (}) comment(// => on Windows XP:) comment(// SIGINT SIGILL SIGABRT SIGFPE SIGSEGV SIGTERM SIGBREAK) @@ -9077,7 +9077,7 @@ type(class) class(DiagSignalHandler) directive(implements) ident(SignalHandler) ident(println)operator(()string<delimiter(")content(Diagnostic Signal handler called for signal )delimiter(")>operator(+)ident(sig)(\)) comment(// Output information for each thread) keyword(def) ident(list) operator(=) type([]) - pre_type(Thread)operator(.)ident(activeCount)operator(()(\))operator(.)ident(each)operator({) ident(list) operator(+=) keyword(null) (}) + pre_type(Thread)operator(.)ident(activeCount)operator(()(\))operator(.)ident(each)operator({) ident(list) operator(+=) pre_constant(null) (}) pre_type(Thread)type([]) ident(threadArray) operator(=) ident(list) keyword(as) pre_type(Thread)type([]) type(int) ident(numThreads) operator(=) pre_type(Thread)operator(.)ident(enumerate)operator(()ident(threadArray)(\)) ident(println)operator(()string<delimiter(")content(Current threads:)delimiter(")>(\)) @@ -9227,7 +9227,7 @@ ident(groovy) operator(-)ident(l) integer(5000) operator(-)ident(e) string<delim comment(// a web server as a script (extension to cookbook\)) ident(server) operator(=) keyword(new) pre_type(ServerSocket)operator(()integer(5000)(\)) - keyword(while)operator(()keyword(true)(\)) operator({) + keyword(while)operator(()pre_constant(true)(\)) operator({) ident(server)operator(.)ident(accept)operator(()(\)) operator({) ident(socket) operator(->) ident(socket)operator(.)ident(withStreams) operator({) ident(input)operator(,) ident(output) operator(->) comment(// ignore input and just serve dummy content) @@ -9245,7 +9245,7 @@ comment(//---------------------------------------------------------------------- comment(// @@PLEAC@@_17.3) comment(//----------------------------------------------------------------------------------) ident(server) operator(=) keyword(new) pre_type(ServerSocket)operator(()integer(5000)(\)) -keyword(while)operator(()keyword(true)(\)) operator({) +keyword(while)operator(()pre_constant(true)(\)) operator({) ident(server)operator(.)ident(accept)operator(()(\)) operator({) ident(socket) operator(->) ident(socket)operator(.)ident(withStreams) operator({) ident(input)operator(,) ident(output) operator(->) ident(w) operator(=) keyword(new) pre_type(PrintWriter)operator(()ident(output)(\)) @@ -9277,7 +9277,7 @@ comment(//---------------------------------------------------------------------- comment(// UDP server) ident(socket) operator(=) keyword(new) pre_type(DatagramSocket)operator(()integer(5000)(\)) ident(buffer) operator(=) operator(()string<delimiter(')content( )delimiter(')> operator(*) integer(4096)(\)) keyword(as) type(byte)type([]) -keyword(while)operator(()keyword(true)(\)) operator({) +keyword(while)operator(()pre_constant(true)(\)) operator({) ident(incoming) operator(=) keyword(new) pre_type(DatagramPacket)operator(()ident(buffer)operator(,) ident(buffer)operator(.)ident(length)(\)) ident(socket)operator(.)ident(receive)operator(()ident(incoming)(\)) ident(s) operator(=) keyword(new) pre_type(String)operator(()ident(incoming)operator(.)ident(data)operator(,) integer(0)operator(,) ident(incoming)operator(.)ident(length)(\)) @@ -9395,7 +9395,7 @@ keyword(for) operator(()ident(port) keyword(in) integer(1)operator(..)integer(10 ident(s) operator(=) keyword(new) pre_type(Socket)operator(()ident(host)operator(,) ident(port)(\)) ident(println)operator(()string<delimiter(")content(There is a server on port )inline<inline_delimiter($)ident(port)>content( of )inline<inline_delimiter($)ident(host)>delimiter(")>(\)) (}) - keyword(catch) operator(()pre_type(Exception) ident(ex)(\)) operator({)(}) + keyword(catch) operator(()exception(Exception) ident(ex)(\)) operator({)(}) (}) comment(// You could open a ServerSocket(\) on each unused port and monitor those.) comment(//----------------------------------------------------------------------------------) @@ -9695,13 +9695,13 @@ keyword(def) method(readUntil)operator(() ident(pattern) (\)) operator({) keyword(return) ident(found) (}) (}) - keyword(return) keyword(null) + keyword(return) pre_constant(null) (}) ident(telnet) operator(=) keyword(new) ident(TelnetClient)operator(()(\)) ident(telnet)operator(.)ident(connect)operator(() string<delimiter(')content(rainmaker.wunderground.com)delimiter(')>operator(,) integer(3000) (\)) ident(reader) operator(=) ident(telnet)operator(.)ident(inputStream)operator(.)ident(newReader)operator(()(\)) -ident(writer) operator(=) keyword(new) pre_type(PrintWriter)operator(()keyword(new) pre_type(OutputStreamWriter)operator(()ident(telnet)operator(.)ident(outputStream)(\))operator(,)keyword(true)(\)) +ident(writer) operator(=) keyword(new) pre_type(PrintWriter)operator(()keyword(new) pre_type(OutputStreamWriter)operator(()ident(telnet)operator(.)ident(outputStream)(\))operator(,)pre_constant(true)(\)) ident(readUntil)operator(() string<delimiter(")content(Welcome)delimiter(")> (\)) ident(println) string<delimiter(')content(Welcome)delimiter(')> operator(+) ident(readUntil)operator(() string<delimiter(")content(!)delimiter(")> (\)) ident(readUntil)operator(() string<delimiter(")content(continue:)delimiter(")> (\)) @@ -10004,7 +10004,7 @@ comment(// </table>) keyword(import) include(groovy.sql.Sql) keyword(import) include(groovy.xml.MarkupBuilder) -ident(dbHandle) operator(=) keyword(null) +ident(dbHandle) operator(=) pre_constant(null) ident(dbUrl) operator(=) string<delimiter(')content(jdbc:hsqldb:...)delimiter(')> keyword(def) method(getDb)operator(()(\))operator({) keyword(if) operator(()ident(dbHandle)(\)) keyword(return) ident(dbHandle) @@ -10441,7 +10441,7 @@ keyword(def) method(toPage)operator(()ident(name)(\)) operator({) ident(b)operat keyword(def) method(dropDown)operator(()ident(name)operator(,) ident(values)(\)) operator({) ident(b)operator(.)ident(select)operator(()key(name)operator(:)ident(name)(\))operator({) ident(values)operator(.)ident(each)operator({) - keyword(if) operator(()ident(param)operator(()ident(name)(\))operator(==)local_variable(it)(\)) ident(option)operator(()key(value)operator(:)local_variable(it)operator(,) key(selected)operator(:)keyword(true)operator(,) local_variable(it)(\)) + keyword(if) operator(()ident(param)operator(()ident(name)(\))operator(==)local_variable(it)(\)) ident(option)operator(()key(value)operator(:)local_variable(it)operator(,) key(selected)operator(:)pre_constant(true)operator(,) local_variable(it)(\)) keyword(else) ident(option)operator(()key(value)operator(:)local_variable(it)operator(,) local_variable(it)(\)) (}) (}) @@ -10491,17 +10491,17 @@ ident(println) ident(bytes)operator(.)ident(size)operator(()(\)) comment(// => 6 comment(// various forms of potential error checking) keyword(try) operator({) keyword(new) pre_type(URL)operator(()string<delimiter(')content(x:y:z)delimiter(')>(\)) -(}) keyword(catch) operator(()pre_type(MalformedURLException) ident(ex)(\)) operator({) +(}) keyword(catch) operator(()exception(MalformedURLException) ident(ex)(\)) operator({) ident(println) ident(ex)operator(.)ident(message) comment(// => unknown protocol: x) (}) keyword(try) operator({) keyword(new) pre_type(URL)operator(()string<delimiter(')content(cnn.com/not.there)delimiter(')>(\)) -(}) keyword(catch) operator(()pre_type(MalformedURLException) ident(ex)(\)) operator({) +(}) keyword(catch) operator(()exception(MalformedURLException) ident(ex)(\)) operator({) ident(println) ident(ex)operator(.)ident(message) comment(// => no protocol: cnn.com/not.there) (}) keyword(try) operator({) ident(content) operator(=) keyword(new) pre_type(URL)operator(()string<delimiter(')content(http://cnn.com/not.there)delimiter(')>(\))operator(.)ident(text) -(}) keyword(catch) operator(()pre_type(FileNotFoundException) ident(ex)(\)) operator({) +(}) keyword(catch) operator(()exception(FileNotFoundException) ident(ex)(\)) operator({) ident(println) string<delimiter(")content(Couldn't find: )delimiter(")> operator(+) ident(ex)operator(.)ident(message) comment(// => Couldn't find: http://www.cnn.com/not.there) (}) @@ -10596,7 +10596,7 @@ comment(// @@PLEAC@@_20.5) comment(//----------------------------------------------------------------------------------) comment(// using CyberNeko Parser (people.apache.org/~andyc/neko/doc\)) ident(parser) operator(=) keyword(new) ident(org)operator(.)ident(cyberneko)operator(.)ident(html)operator(.)ident(parsers)operator(.)ident(SAXParser)operator(()(\)) -ident(parser)operator(.)ident(setFeature)operator(()string<delimiter(')content(http://xml.org/sax/features/namespaces)delimiter(')>operator(,) keyword(false)(\)) +ident(parser)operator(.)ident(setFeature)operator(()string<delimiter(')content(http://xml.org/sax/features/namespaces)delimiter(')>operator(,) pre_constant(false)(\)) ident(page) operator(=) keyword(new) ident(XmlParser)operator(()ident(parser)(\))operator(.)ident(parse)operator(()string<delimiter(')content(http://www.perl.com/CPAN/)delimiter(')>(\)) ident(page)operator(.)ident(depthFirst)operator(()(\))operator(.)ident(each)operator({) ident(println) local_variable(it)operator(.)ident(text)operator(()(\)) (}) comment(//----------------------------------------------------------------------------------) @@ -10608,7 +10608,7 @@ comment(// removing tags, see 20.5) comment(// extracting tags: htitle using cyberneko and XmlSlurper) ident(parser) operator(=) keyword(new) ident(org)operator(.)ident(cyberneko)operator(.)ident(html)operator(.)ident(parsers)operator(.)ident(SAXParser)operator(()(\)) -ident(parser)operator(.)ident(setFeature)operator(()string<delimiter(')content(http://xml.org/sax/features/namespaces)delimiter(')>operator(,) keyword(false)(\)) +ident(parser)operator(.)ident(setFeature)operator(()string<delimiter(')content(http://xml.org/sax/features/namespaces)delimiter(')>operator(,) pre_constant(false)(\)) ident(page) operator(=) keyword(new) ident(XmlParser)operator(()ident(parser)(\))operator(.)ident(parse)operator(()string<delimiter(')content(http://www.perl.com/CPAN/)delimiter(')>(\)) ident(println) ident(page)operator(.)ident(HEAD)operator(.)ident(TITLE)operator([)integer(0)(])operator(.)ident(text)operator(()(\)) @@ -10635,7 +10635,7 @@ keyword(def) method(checkUrl)operator(()ident(page)operator(,) ident(url)(\)) op ident(qurl) operator(=) ident(page)operator(.)ident(getFullyQualifiedUrl)operator(()ident(url)(\)) ident(client)operator(.)ident(getPage)operator(()ident(qurl)(\)) ident(println) string<delimiter(')content(OK)delimiter(')> - (}) keyword(catch) operator(()pre_type(Exception) ident(ex)(\)) operator({) + (}) keyword(catch) operator(()exception(Exception) ident(ex)(\)) operator({) ident(println) string<delimiter(')content(BAD)delimiter(')> (}) (}) diff --git a/test/scanners/groovy/raistlin77.expected.raydebug b/test/scanners/groovy/raistlin77.expected.raydebug index f7c30db..58e66a9 100644 --- a/test/scanners/groovy/raistlin77.expected.raydebug +++ b/test/scanners/groovy/raistlin77.expected.raydebug @@ -88,7 +88,7 @@ directive(public) type(class) class(RequestBuilder) operator({) directive(private) ident(newReqID)operator(()(\))operator({) keyword(try)operator({) ident(reqID) operator(+=) integer(1)operator(;) - (}) keyword(catch)operator(() pre_type(ArithmeticException) ident(e)(\))operator({) + (}) keyword(catch)operator(() exception(ArithmeticException) ident(e)(\))operator({) ident(reqID) operator(=) integer(1)operator(;) (}) keyword(return) ident(reqID)operator(;) @@ -97,9 +97,9 @@ directive(public) type(class) class(RequestBuilder) operator({) comment(/** * bilde Easy-Documentenschreibweise aus Lagerort und Archiv oder EasyArchivReferenz und Mappe+Version */) - directive(public) pre_type(String) ident(buildEasyDocRef)operator(()ident(location)operator(,) ident(archiv)operator(=)keyword(null)operator(,) ident(mappe)operator(=)keyword(null)operator(,) ident(version)operator(=)keyword(null)(\))operator({) + directive(public) pre_type(String) ident(buildEasyDocRef)operator(()ident(location)operator(,) ident(archiv)operator(=)pre_constant(null)operator(,) ident(mappe)operator(=)pre_constant(null)operator(,) ident(version)operator(=)pre_constant(null)(\))operator({) keyword(if)operator(()operator(!)ident(mappe) operator(||) operator(!)ident(version)(\))operator({) - keyword(throw) keyword(new) pre_type(RuntimeException)operator(()string<delimiter(")content(Keine Mappe oder Version angegeben )inline<inline_delimiter(${)ident(mappe)inline_delimiter(})>content(,)inline<inline_delimiter(${)ident(version)inline_delimiter(})>delimiter(")>(\)) + keyword(throw) keyword(new) exception(RuntimeException)operator(()string<delimiter(")content(Keine Mappe oder Version angegeben )inline<inline_delimiter(${)ident(mappe)inline_delimiter(})>content(,)inline<inline_delimiter(${)ident(version)inline_delimiter(})>delimiter(")>(\)) (}) keyword(else) operator({) keyword(return) ident(buildEasyArchivRef)operator(()ident(location)operator(,) ident(archiv)(\)) operator(+) string<delimiter(')content(,)delimiter(')> operator(+) ident(mappe) operator(+) string<delimiter(')content(,)delimiter(')> operator(+) ident(version)operator(;) (}) @@ -108,7 +108,7 @@ directive(public) type(class) class(RequestBuilder) operator({) comment(/** * bilde Easy-Archivschreibweise aus Lagerort und Archiv */) - directive(public) pre_type(String) ident(buildEasyArchivRef)operator(()ident(location)operator(,) ident(archive)operator(=)keyword(null)(\))operator({) + directive(public) pre_type(String) ident(buildEasyArchivRef)operator(()ident(location)operator(,) ident(archive)operator(=)pre_constant(null)(\))operator({) keyword(def) ident(locarc) keyword(if)operator(() ident(archive) (\))operator({) ident(locarc) operator(=) string<delimiter(")char(\\$)content((#)inline<inline_delimiter(${)ident(location)inline_delimiter(})>content(\))char(\\\\)inline<inline_delimiter(${)ident(archive)inline_delimiter(})>delimiter(")> @@ -154,7 +154,7 @@ directive(public) type(class) class(RequestBuilder) operator({) * section kann folgende (auch mehrere\) Wert enthalten: * FIELDLIST, HITLISTS, SEARCHMASKS, STATISTICS, RIGHTS, BITMAPS, SELLISTS */) - directive(public) pre_type(String) ident(getArchiveDescription)operator(()ident(section)operator(,) ident(location)operator(,) ident(archive)operator(=)keyword(null)(\))operator({) + directive(public) pre_type(String) ident(getArchiveDescription)operator(()ident(section)operator(,) ident(location)operator(,) ident(archive)operator(=)pre_constant(null)(\))operator({) keyword(def) ident(locarc) operator(=) ident(buildEasyArchivRef)operator(() ident(location)operator(,) ident(archive) (\)) keyword(return) ident(buildRequest)operator(()(\))operator({) local_variable(it)operator(.)ident(ARCDESCRIPTION)operator(() key(REQUESTID)operator(:)ident(newReqID)operator(()(\))operator(,) key(ARCHIVE)operator(:)ident(locarc)operator(,) key(SECTION)operator(:)ident(section) (\)) @@ -193,7 +193,7 @@ directive(public) type(class) class(RequestBuilder) operator({) type(int) ident(blobid)operator(=)integer(2000)operator(;) keyword(return) ident(buildRequest)operator(()(\))operator({) ident(xml)operator(->) ident(xml)operator(.)ident(IMPORT)operator(() key(REQUESTID)operator(:)ident(newReqID)operator(()(\))operator(,) key(ARCHIVE)operator(:)ident(archivref)operator(,) key(MODE)operator(:)string<delimiter(')content(SYNC)delimiter(')>operator(,) key(FOLDER)operator(:)string<delimiter(')delimiter(')>(\))operator({) - ident(DOCUMENT)operator(() key(ID)operator(:)string<delimiter(')content(DOCID_1)delimiter(')>operator(,) key(FIELDCOUNT)operator(:)ident(cnt)operator(,) key(EASYDOCREF)operator(:)ident(buildEasyDocRef)operator(()ident(archivref)operator(,) keyword(null)operator(,) ident(mappe)operator(,) ident(version) (\)) (\))operator({) + ident(DOCUMENT)operator(() key(ID)operator(:)string<delimiter(')content(DOCID_1)delimiter(')>operator(,) key(FIELDCOUNT)operator(:)ident(cnt)operator(,) key(EASYDOCREF)operator(:)ident(buildEasyDocRef)operator(()ident(archivref)operator(,) pre_constant(null)operator(,) ident(mappe)operator(,) ident(version) (\)) (\))operator({) ident(fields)operator(.)ident(each)operator(()(\))operator({) ident(field) operator(->) ident(FIELD)operator(() key(CODE)operator(:)string<delimiter(')content(ANSI)delimiter(')>operator(,) key(TYPE)operator(:)string<delimiter(')content(STRING)delimiter(')>operator(,) key(NAME)operator(:)ident(field)operator(.)ident(key)operator(,) key(ID)operator(:)operator(()ident(id)operator(+=)integer(1)(\))operator(,) key(USE)operator(:)string<delimiter(')content(USER)delimiter(')> (\))operator({) ident(DATA)operator(()(\))operator({) @@ -303,7 +303,7 @@ keyword(import) include(it.sauronsoftware.base64.Base64) directive(public) type(class) class(ResponseParser) operator({) directive(private) pre_type(String) ident(lastResponse) operator(=) string<delimiter(")delimiter(")>operator(;) - directive(private) pre_type(String) ident(lastError) operator(=) keyword(null)operator(;) + directive(private) pre_type(String) ident(lastError) operator(=) pre_constant(null)operator(;) directive(static) directive(private) ident(PROPERTIES) operator(=) operator([)operator(:)(]) directive(static) operator({) @@ -341,7 +341,7 @@ directive(public) type(class) class(ResponseParser) operator({) * * */) - directive(private) ident(getProperties)operator(()ident(ln)operator(,) ident(prop)operator(,) ident(desc)operator(=)keyword(false)(\))operator({) + directive(private) ident(getProperties)operator(()ident(ln)operator(,) ident(prop)operator(,) ident(desc)operator(=)pre_constant(false)(\))operator({) keyword(def) ident(ret) operator(=) operator([)operator(:)(]) keyword(if)operator(()ident(desc)(\)) ident(ret)operator([)string<delimiter(')content(TEXT)delimiter(')>(]) operator(=) ident(ln)operator(.)ident(text)operator(()(\)) ident(prop)operator(.)ident(each)operator(()(\))operator({) local_variable(it) operator(->) @@ -357,7 +357,7 @@ directive(public) type(class) class(ResponseParser) operator({) */) keyword(def) method(parse)operator(()pre_type(String) ident(response)(\)) directive(throws) ident(ParserException) operator({) ident(lastResponse) operator(=) ident(response)operator(;) - ident(lastError) operator(=) keyword(null)operator(;) + ident(lastError) operator(=) pre_constant(null)operator(;) keyword(def) ident(tmpError) operator(=) type([])operator(;) keyword(def) ident(xml) operator(=) keyword(new) ident(XmlParser)operator(()(\))operator(.)ident(parseText)operator(() ident(response) (\)) @@ -368,7 +368,7 @@ directive(public) type(class) class(ResponseParser) operator({) (}) ident(lastError) operator(=) ident(tmpError)operator(.)ident(join)operator(()string<delimiter(")char(\\n)delimiter(")>(\))operator(;) keyword(throw)operator(() keyword(new) ident(ParserException)operator(() ident(lastError) (\)) (\)) - keyword(return) keyword(null)operator(;) + keyword(return) pre_constant(null)operator(;) (}) keyword(def) ident(suc) operator(=) ident(xml)operator(.)ident(SUCCESS) @@ -376,7 +376,7 @@ directive(public) type(class) class(ResponseParser) operator({) keyword(if)operator(() ident(suc)operator(.)ident(size)operator(()(\)) operator(<=) integer(0) (\))operator({) ident(lastError) operator(=) string<delimiter(")content(Keine Request Informationen zur Verabeitung vorhanden)delimiter(")> keyword(throw)operator(() keyword(new) ident(ParserException)operator(() ident(lastError) (\)) (\)) - keyword(return) keyword(null)operator(;) + keyword(return) pre_constant(null)operator(;) (}) keyword(def) ident(ret) operator(=) operator([)operator(:)(]) @@ -394,7 +394,7 @@ directive(public) type(class) class(ResponseParser) operator({) keyword(case) string<delimiter(')content(ARCHIVES)delimiter(')>operator(:) keyword(case) string<delimiter(')content(LOCATIONS)delimiter(')>operator(:) ident(ret)operator([) ident(sucNode)operator(.@)ident(COMMAND) (]) operator(=) type([]) - ident(sucNode)operator(.)ident(each)operator(()(\))operator({) ident(ln) operator(->) ident(ret)operator([) ident(sucNode)operator(.@)ident(COMMAND) (]) operator(<)operator(<) ident(getProperties)operator(() ident(ln)operator(,) ident(PROPERTIES)operator([) ident(ln)operator(.)ident(name)operator(()(\)) (])operator(,) keyword(true) (\)) (}) + ident(sucNode)operator(.)ident(each)operator(()(\))operator({) ident(ln) operator(->) ident(ret)operator([) ident(sucNode)operator(.@)ident(COMMAND) (]) operator(<)operator(<) ident(getProperties)operator(() ident(ln)operator(,) ident(PROPERTIES)operator([) ident(ln)operator(.)ident(name)operator(()(\)) (])operator(,) pre_constant(true) (\)) (}) keyword(break)operator(;) keyword(case) string<delimiter(')content(ARCDESCRIPTION)delimiter(')>operator(:) ident(ret)operator([) ident(sucNode)operator(.@)ident(COMMAND) (]) operator(=) operator([)operator(:)(]) @@ -437,7 +437,7 @@ directive(public) type(class) class(ResponseParser) operator({) keyword(def) ident(tmp) operator(=) ident(getProperties)operator(()ident(ln)operator(,) ident(PROPERTIES)operator([) ident(ln)operator(.)ident(name)operator(()(\)) (])(\)) ident(tmp)operator([)string<delimiter(')content(TABFIELD)delimiter(')>(]) operator(=) type([]) ident(ln)operator(.)ident(each)operator(()(\))operator({) ident(tab) operator(->) - ident(tmp)operator([)string<delimiter(')content(TABFIELD)delimiter(')>(]) operator(<)operator(<) ident(getProperties)operator(()ident(tab)operator(,) ident(PROPERTIES)operator([) ident(ln)operator(.)ident(name)operator(()(\))operator(+)ident(tab)operator(.)ident(name)operator(()(\)) (])operator(,) keyword(true)(\)) + ident(tmp)operator([)string<delimiter(')content(TABFIELD)delimiter(')>(]) operator(<)operator(<) ident(getProperties)operator(()ident(tab)operator(,) ident(PROPERTIES)operator([) ident(ln)operator(.)ident(name)operator(()(\))operator(+)ident(tab)operator(.)ident(name)operator(()(\)) (])operator(,) pre_constant(true)(\)) (}) ident(ret)operator([) ident(sucNode)operator(.@)ident(COMMAND) (])operator([)string<delimiter(')content(HITLINE)delimiter(')>(]) operator(<)operator(<) ident(tmp) (}) @@ -454,7 +454,7 @@ directive(public) type(class) class(ResponseParser) operator({) ident(ret)operator([) ident(sucNode)operator(.@)ident(COMMAND) (]) operator(=) ident(getProperties)operator(() ident(sucNode)operator(.)ident(DOCUMENT)operator([)integer(0)(])operator(,) ident(PROPERTIES)operator([)string<delimiter(')content(DOCUMENT)delimiter(')>(]) (\)) ident(ret)operator([) ident(sucNode)operator(.@)ident(COMMAND) (])operator([)string<delimiter(')content(FIELD)delimiter(')>(]) operator(=) type([]) ident(sucNode)operator(.)ident(DOCUMENT)operator([)integer(0)(])operator(.)ident(each)operator(()(\))operator({) ident(ln) operator(->) - keyword(def) ident(tmp) operator(=) ident(getProperties)operator(() ident(ln)operator(,) ident(PROPERTIES)operator([)string<delimiter(')content(DOCUMENTFIELD)delimiter(')>(])operator(,) keyword(true) (\)) + keyword(def) ident(tmp) operator(=) ident(getProperties)operator(() ident(ln)operator(,) ident(PROPERTIES)operator([)string<delimiter(')content(DOCUMENTFIELD)delimiter(')>(])operator(,) pre_constant(true) (\)) ident(tmp)operator([)string<delimiter(')content(DATA)delimiter(')>(]) operator(=) operator([)operator(:)(]) ident(ln)operator(.)ident(each)operator(()(\))operator({) ident(dta) operator(->) comment(//println tmp['TYPE']) |