Java Scanner: Package names are recognized, along with some code cleanup. Closes #210.

8 files changed, 130 insertions, 90 deletions

diff --git a/Changes.textile b/Changes.textile
index 8ffb8f0..0df9c3f 100644
--- a/Changes.textile
+++ b/Changes.textile
@@ -20,7 +20,7 @@ h3. @Tokens::AbbreviationForKind@
 * *RENAMED* from @ClassOfKind@. The term "token class" is no longer used in CodeRay. Instead, tokens have _kinds_.
   See "#122":http://redmine.rubychan.de/issues/122.
 * *REMOVED* token kinds @:attribute_name_fat@, @:attribute_value_fat@, @:operator_fat@, @:tag_fat@, and @:xml_text@.
-* *ADDED* token kind @:filename@.
+* *ADDED* token kinds @:filename@ and @:namespace@.
 * *CHANGED*: Don't raise error for unknown token kinds unless in @$CODERAY_DEBUG@ mode.
 
 h3. @Encoders::CommentFilter@
@@ -80,12 +80,17 @@ h3. @Scanners::Diff@
 
 h3. @Scanners::JavaScript@
  
-* *IMPROVED* Added @NaN@ and @Infinity@ to list of predefined constants.
-* *FIXED* Don't keep state of XML scanner between calls for E4X literals.
+* *IMPROVED*: Added @NaN@ and @Infinity@ to list of predefined constants.
+* *FIXED*: Don't keep state of XML scanner between calls for E4X literals.
+
+h3. @Scanners::Java@
+ 
+* *NEW*: Package names are highlighted as @:namespace@.
+  See "#210":http://redmine.rubychan.de/issues/210.
 
 h3. @Scanners::Plaintext@
  
-* *IMPROVED* Just returns the string without scanning (faster).
+* *IMPROVED*: Just returns the string without scanning (faster).
  
  This is much faster than scanning until @/\z/@ in Ruby 1.8.
 
diff --git a/lib/coderay/scanners/java.rb b/lib/coderay/scanners/java.rb
index 203385d..2dfb1b6 100644
--- a/lib/coderay/scanners/java.rb
+++ b/lib/coderay/scanners/java.rb
@@ -52,7 +52,9 @@ module Scanners
 
       state = :initial
       string_delimiter = nil
-      import_clause = class_name_follows = last_token_dot = false
+      package_name_expected = false
+      class_name_follows = false
+      last_token_dot = false
 
       until eos?
 
@@ -71,8 +73,8 @@ module Scanners
             tokens << [match, :comment]
             next
           
-          elsif import_clause && scan(/ #{IDENT} (?: \. #{IDENT} )* /ox)
-            kind = :include
+          elsif package_name_expected && scan(/ #{IDENT} (?: \. #{IDENT} )* /ox)
+            kind = package_name_expected
           
           elsif match = scan(/ #{IDENT} | \[\] /ox)
             kind = IDENT_KIND[match]
@@ -82,15 +84,21 @@ module Scanners
               kind = :class
               class_name_follows = false
             else
-              import_clause = true if match == 'import'
-              class_name_follows = true if match == 'class' || match == 'interface'
+              case match
+              when 'import'
+                package_name_expected = :include
+              when 'package'
+                package_name_expected = :namespace
+              when 'class', 'interface'
+                class_name_follows = true
+              end
             end
           
           elsif scan(/ \.(?!\d) | [,?:()\[\]}] | -- | \+\+ | && | \|\| | \*\*=? | [-+*\/%^~&|<>=!]=? | <<<?=? | >>>?=? /x)
             kind = :operator
           
           elsif scan(/;/)
-            import_clause = false
+            package_name_expected = false
             kind = :operator
           
           elsif scan(/\{/)
diff --git a/lib/coderay/styles/alpha.rb b/lib/coderay/styles/alpha.rb
index 411ac0c..24b364a 100644
--- a/lib/coderay/styles/alpha.rb
+++ b/lib/coderay/styles/alpha.rb
@@ -82,6 +82,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .iv { color:#33B }
 .la { color:#970; font-weight:bold }
 .lv { color:#963 }
+.ns { color:#707; font-weight:bold }
 .oc { color:#40E; font-weight:bold }
 .op { }
 .pc { color:#058; font-weight:bold }
diff --git a/lib/coderay/styles/cycnus.rb b/lib/coderay/styles/cycnus.rb
index a7eba80..7427662 100644
--- a/lib/coderay/styles/cycnus.rb
+++ b/lib/coderay/styles/cycnus.rb
@@ -83,6 +83,7 @@ table.CodeRay td { padding: 2px 4px; vertical-align: top; }
 .iv { color:#33B }
 .la { color:#970; font-weight:bold }
 .lv { color:#963 }
+.ns { color:#707; font-weight:bold }
 .oc { color:#40E; font-weight:bold }
 .op { }
 .pc { color:#058; font-weight:bold }
diff --git a/lib/coderay/token_kinds.rb b/lib/coderay/token_kinds.rb
index 29bacb4..f6341fb 100755
--- a/lib/coderay/token_kinds.rb
+++ b/lib/coderay/token_kinds.rb
@@ -49,6 +49,7 @@ module CodeRay
       :label => 'la',
       :local_variable => 'lv',
       :modifier => 'mod',
+      :namespace => 'ns',
       :oct => 'oc',
       :predefined => 'pd',
       :preprocessor => 'pp',
diff --git a/test/scanners/java/example.expected.raydebug b/test/scanners/java/example.expected.raydebug
new file mode 100644
index 0000000..58e847d
--- /dev/null
+++ b/test/scanners/java/example.expected.raydebug
@@ -0,0 +1,12 @@
+keyword(package) namespace(pl.silvermedia.ws)operator(;)
+keyword(import) include(java.util.List)operator(;)
+
+keyword(import) include(javax.jws.WebParam)operator(;)
+keyword(import) include(javax.jws.WebService)operator(;)
+
+annotation(@WebService)
+directive(public) type(interface) class(ContactUsService) operator({)
+  pre_type(List)operator(<)ident(Message)operator(>) ident(getMessages)operator(()operator(\))operator(;)
+  ident(Message) ident(getFirstMessage)operator(()operator(\))operator(;)
+    type(void) ident(postMessage)operator(()annotation(@WebParam)operator(()ident(name) operator(=) string<delimiter(")content(message)delimiter(")>operator(\)) ident(Message) ident(message)operator(\))operator(;)
+operator(})
diff --git a/test/scanners/java/example.in.java b/test/scanners/java/example.in.java
new file mode 100644
index 0000000..7aa6ce1
--- /dev/null
+++ b/test/scanners/java/example.in.java
@@ -0,0 +1,12 @@
+package pl.silvermedia.ws;
+import java.util.List;
+
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+@WebService
+public interface ContactUsService {
+  List<Message> getMessages();
+  Message getFirstMessage();
+    void postMessage(@WebParam(name = "message") Message message);
+}
diff --git a/test/scanners/java/jruby.expected.raydebug b/test/scanners/java/jruby.expected.raydebug
index 7cfd1f0..ece5b90 100644
--- a/test/scanners/java/jruby.expected.raydebug
+++ b/test/scanners/java/jruby.expected.raydebug
@@ -1,4 +1,4 @@
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 directive(public) type(enum) ident(CompatVersion) operator({)
 
@@ -41,7 +41,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 comment(/**
  * An almost entirely useless interface for those objects that we _really_ want
@@ -81,7 +81,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 comment(/**
  * Error numbers.
  * @fixme
@@ -212,7 +212,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.util.List)operator(;)
 keyword(import) include(java.util.Map)operator(;)
@@ -518,7 +518,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.applet.Applet)operator(;)
 keyword(import) include(java.awt.BorderLayout)operator(;)
@@ -951,7 +951,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.BufferedWriter)operator(;)
 keyword(import) include(java.io.OutputStreamWriter)operator(;)
@@ -1014,7 +1014,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.BufferedReader)operator(;)
 keyword(import) include(java.io.InputStreamReader)operator(;)
@@ -1169,7 +1169,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 comment(/**
  * @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
@@ -1301,7 +1301,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.InputStream)operator(;)
 keyword(import) include(java.io.PrintStream)operator(;)
@@ -1554,7 +1554,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.lang.ref.SoftReference)operator(;)
 
@@ -1631,7 +1631,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.PrintStream)operator(;)
 
@@ -1737,7 +1737,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 comment(/**
  * @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
@@ -1812,7 +1812,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.ByteArrayInputStream)operator(;)
 keyword(import) include(java.io.File)operator(;)
@@ -4849,7 +4849,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.FrameField)operator(;)
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
@@ -5289,7 +5289,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.lang.reflect.Array)operator(;)
 keyword(import) include(java.io.IOException)operator(;)
@@ -8040,7 +8040,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.math.BigDecimal)operator(;)
 keyword(import) include(java.math.BigInteger)operator(;)
@@ -9530,7 +9530,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.IOException)operator(;)
 keyword(import) include(java.math.BigDecimal)operator(;)
@@ -10306,7 +10306,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyClass)operator(;)
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
@@ -10452,7 +10452,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyClass)operator(;)
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
@@ -10622,7 +10622,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.IOException)operator(;)
 keyword(import) include(java.util.ArrayList)operator(;)
@@ -11363,7 +11363,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.File)operator(;)
 keyword(import) include(java.net.MalformedURLException)operator(;)
@@ -11464,7 +11464,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyModule)operator(;)
@@ -11631,7 +11631,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(static) include(org.jruby.util.Numeric.f_abs)operator(;)
 keyword(import) include(static) include(org.jruby.util.Numeric.f_abs2)operator(;)
@@ -12566,7 +12566,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyClass)operator(;)
@@ -12621,7 +12621,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.security.Provider)operator(;)
 keyword(import) include(java.security.MessageDigest)operator(;)
@@ -12967,7 +12967,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.File)operator(;)
 keyword(import) include(java.io.FileInputStream)operator(;)
@@ -13540,7 +13540,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.util.Comparator)operator(;)
 keyword(import) include(java.util.Arrays)operator(;)
@@ -14198,7 +14198,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyModule)operator(;)
@@ -14351,7 +14351,7 @@ directive(public) type(class) class(RubyEnumerator) directive(extends) ident(Rub
         keyword(return) ident(RuntimeHelpers)operator(.)ident(invoke)operator(()ident(context)operator(,) ident(enumerator)operator(,) string<delimiter(")content(new)delimiter(")>operator(,) ident(self)operator(,) ident(self)operator(.)ident(getRuntime)operator(()operator(\))operator(.)ident(fastNewSymbol)operator(()string<delimiter(")content(each_cons)delimiter(")>operator(\))operator(,) ident(arg)operator(\))operator(;)
     operator(})
 operator(})
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyModule)operator(;)
@@ -14646,7 +14646,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.IOException)operator(;)
 keyword(import) include(java.io.PrintStream)operator(;)
@@ -14944,7 +14944,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.util.io.OpenFile)operator(;)
 keyword(import) include(org.jruby.util.io.ChannelDescriptor)operator(;)
@@ -16481,7 +16481,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.FileDescriptor)operator(;)
 
@@ -16862,7 +16862,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyModule)operator(;)
@@ -17143,7 +17143,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.math.BigInteger)operator(;)
 keyword(import) include(java.util.HashMap)operator(;)
@@ -18058,7 +18058,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(static) include(org.jruby.util.Numeric.f_expt)operator(;)
 keyword(import) include(static) include(org.jruby.util.Numeric.f_mul)operator(;)
@@ -18671,7 +18671,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyModule)operator(;)
@@ -18757,7 +18757,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.util.io.STDIO)operator(;)
 keyword(import) include(java.util.HashMap)operator(;)
@@ -19387,7 +19387,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.IOException)operator(;)
 keyword(import) include(java.util.AbstractCollection)operator(;)
@@ -20990,7 +20990,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.nio.ByteBuffer)operator(;)
 keyword(import) include(java.nio.CharBuffer)operator(;)
@@ -21369,7 +21369,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.BufferedInputStream)operator(;)
 keyword(import) include(java.io.ByteArrayInputStream)operator(;)
@@ -22593,7 +22593,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyClass)operator(;)
@@ -22879,7 +22879,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.EOFException)operator(;)
 keyword(import) include(java.io.FileDescriptor)operator(;)
@@ -25824,7 +25824,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.IOException)operator(;)
 keyword(import) include(java.io.PrintWriter)operator(;)
@@ -26183,7 +26183,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.ByteArrayOutputStream)operator(;)
 keyword(import) include(java.math.BigInteger)operator(;)
@@ -27461,7 +27461,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
 
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyClass)operator(;)
@@ -27536,7 +27536,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.ByteArrayInputStream)operator(;)
 keyword(import) include(java.io.ByteArrayOutputStream)operator(;)
@@ -27723,7 +27723,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.util.Iterator)operator(;)
 
@@ -28117,7 +28117,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyModule)operator(;)
@@ -28598,7 +28598,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyClass)operator(;)
@@ -28855,7 +28855,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.lang.reflect.Field)operator(;)
 keyword(import) include(java.lang.reflect.Method)operator(;)
@@ -32254,7 +32254,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
 
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(static) include(org.jruby.runtime.Visibility.PRIVATE)operator(;)
 keyword(import) include(static) include(org.jruby.runtime.Visibility.PROTECTED)operator(;)
@@ -32469,7 +32469,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyClass)operator(;)
@@ -32668,7 +32668,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.nio.ByteBuffer)operator(;)
 keyword(import) include(java.nio.CharBuffer)operator(;)
@@ -32983,7 +32983,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
 
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyClass)operator(;)
@@ -33074,7 +33074,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(static) include(org.jruby.util.Numeric.f_abs)operator(;)
 keyword(import) include(static) include(org.jruby.util.Numeric.f_arg)operator(;)
@@ -33974,7 +33974,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.IOException)operator(;)
 keyword(import) include(java.io.ObjectInputStream)operator(;)
@@ -36937,7 +36937,7 @@ directive(public) type(class) class(RubyObject) directive(implements) pre_type(C
 
 operator(})
 
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.runtime.Block)operator(;)
 keyword(import) include(org.jruby.runtime.builtin.IRubyObject)operator(;)
@@ -37004,7 +37004,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.util.Iterator)operator(;)
 
@@ -37148,7 +37148,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyModule)operator(;)
@@ -37248,7 +37248,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.lang.reflect.InvocationHandler)operator(;)
 keyword(import) include(java.lang.reflect.Method)operator(;)
@@ -37500,7 +37500,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyClass)operator(;)
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
@@ -38171,7 +38171,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.IOException)operator(;)
 keyword(import) include(java.util.List)operator(;)
@@ -38604,7 +38604,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(static) include(org.jruby.util.Numeric.f_add)operator(;)
 keyword(import) include(static) include(org.jruby.util.Numeric.f_cmp)operator(;)
@@ -39598,7 +39598,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.lang.ref.SoftReference)operator(;)
 keyword(import) include(java.util.concurrent.ConcurrentHashMap)operator(;)
@@ -40771,7 +40771,7 @@ directive(public) type(class) class(RubyRegexp) directive(extends) ident(RubyObj
     operator(})
 operator(})
 
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.runtime.builtin.IRubyObject)operator(;)
 
@@ -40809,7 +40809,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyModule)operator(;)
@@ -40912,7 +40912,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(static) include(org.jruby.anno.FrameField.BACKREF)operator(;)
 keyword(import) include(static) include(org.jruby.anno.FrameField.LASTLINE)operator(;)
@@ -44390,7 +44390,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.util.ArrayList)operator(;)
 keyword(import) include(java.util.List)operator(;)
@@ -45218,7 +45218,7 @@ directive(public) type(class) class(RubyStringIO) directive(extends) ident(RubyO
         keyword(if) operator(()operator(!)ident(modes)operator(.)ident(isReadable)operator(()operator(\))operator(\)) ident(closedRead) operator(=) pre_constant(true)operator(;)
     operator(})
 operator(})
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.joni.Matcher)operator(;)
 keyword(import) include(org.joni.Option)operator(;)
@@ -45771,7 +45771,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.util.List)operator(;)
 
@@ -46392,7 +46392,7 @@ comment(/*
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.util.concurrent.locks.ReentrantLock)operator(;)
 
@@ -46946,7 +46946,7 @@ directive(public) type(class) class(RubySymbol) directive(extends) ident(RubyObj
         
     operator(})
 operator(})
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.IOException)operator(;)
 keyword(import) include(java.util.List)operator(;)
@@ -47203,7 +47203,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
 
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyClass)operator(;)
@@ -47301,7 +47301,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.IOException)operator(;)
 keyword(import) include(java.nio.channels.Channel)operator(;)
@@ -48183,7 +48183,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.util.HashMap)operator(;)
 keyword(import) include(java.util.Map)operator(;)
@@ -48321,7 +48321,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.lang.ref.SoftReference)operator(;)
 keyword(import) include(java.util.Date)operator(;)
@@ -49163,7 +49163,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.anno.JRubyMethod)operator(;)
 keyword(import) include(org.jruby.anno.JRubyClass)operator(;)
@@ -49288,7 +49288,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.IOException)operator(;)
 
@@ -49979,7 +49979,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(java.io.InputStream)operator(;)
 keyword(import) include(java.io.IOException)operator(;)
@@ -51098,7 +51098,7 @@ comment(/***** BEGIN LICENSE BLOCK *****
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the CPL, the GPL or the LGPL.
  ***** END LICENSE BLOCK *****/)
-keyword(package) ident(org)operator(.)ident(jruby)operator(;)
+keyword(package) namespace(org.jruby)operator(;)
 
 keyword(import) include(org.jruby.runtime.Arity)operator(;)
 keyword(import) include(org.jruby.runtime.Block)operator(;)