GreatSyntacticShift: 'namespace' -> 'package'

compiler/frontend/src/jet/Library.jet

-namespace jet
+package jet
 
-namespace typeinfo {
+package typeinfo {
     class TypeInfo<out T> {
       fun isSubtypeOf(other : TypeInfo<*>) : Boolean
       fun isInstance(obj : Any?) : Boolean
@@ -10,7 +10,7 @@ namespace typeinfo {
     fun typeinfo<T>(expression : T) : TypeInfo<T>
 }
 
-namespace io {
+package io {
   fun print(message : Any?)
   fun print(message : Int)
   fun print(message : Long)

compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex

@@ -161,7 +161,6 @@ LONG_TEMPLATE_ENTRY_END=\}
 // TODO: Decide what to do with """ ... """"
 {RAW_STRING_LITERAL} { return JetTokens.RAW_STRING_LITERAL; }
 
-"namespace"  { return JetTokens.NAMESPACE_KEYWORD ;}
 "continue"   { return JetTokens.CONTINUE_KEYWORD ;}
 "package"    { return JetTokens.NAMESPACE_KEYWORD ;}
 "return"     { return JetTokens.RETURN_KEYWORD ;}

compiler/frontend/src/org/jetbrains/jet/lexer/_JetLexer.java

-/* The following code was generated by JFlex 1.4.3 on 12/16/11 12:34 PM */
+/* The following code was generated by JFlex 1.4.3 on 12/25/11 2:36 PM */
 
 package org.jetbrains.jet.lexer;
 
-import com.intellij.lexer.FlexLexer;
-import com.intellij.psi.TokenType;
+import java.util.*;
+import com.intellij.lexer.*;
+import com.intellij.psi.*;
 import com.intellij.psi.tree.IElementType;
 
-import java.util.Stack;
+import org.jetbrains.jet.lexer.JetTokens;
 
 
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 12/16/11 12:34 PM from the specification file
- * <tt>/Users/abreslav/work/jet-clean/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex</tt>
+ * on 12/25/11 2:36 PM from the specification file
+ * <tt>/Users/abreslav/work/jet/compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex</tt>
  */
 class _JetLexer implements FlexLexer {
   /** initial size of the lookahead buffer */
@@ -39,14 +40,14 @@ class _JetLexer implements FlexLexer {
    * Translates characters to character classes
    */
   private static final String ZZ_CMAP_PACKED = 
-    "\11\0\1\3\1\7\1\0\1\3\23\0\1\3\1\60\1\25\1\100"+
-    "\1\10\1\70\1\66\1\23\1\73\1\74\1\13\1\63\1\77\1\21"+
-    "\1\17\1\12\1\14\11\1\1\75\1\76\1\64\1\61\1\65\1\62"+
-    "\1\11\1\2\1\16\2\2\1\20\1\2\11\4\1\22\3\4\1\55"+
-    "\3\4\1\15\2\4\1\71\1\24\1\72\1\0\1\4\1\6\1\36"+
-    "\1\47\1\42\1\57\1\40\1\53\1\45\1\32\1\33\1\50\1\44"+
-    "\1\52\1\37\1\35\1\43\1\41\1\4\1\46\1\34\1\31\1\26"+
-    "\1\56\1\51\1\15\1\54\1\4\1\27\1\67\1\30\54\0\1\4"+
+    "\11\0\1\3\1\7\1\0\1\3\23\0\1\3\1\57\1\25\1\77"+
+    "\1\10\1\67\1\65\1\23\1\72\1\73\1\13\1\62\1\76\1\21"+
+    "\1\17\1\12\1\14\11\1\1\74\1\75\1\63\1\60\1\64\1\61"+
+    "\1\11\1\2\1\16\2\2\1\20\1\2\11\4\1\22\3\4\1\54"+
+    "\3\4\1\15\2\4\1\70\1\24\1\71\1\0\1\4\1\6\1\42"+
+    "\1\46\1\35\1\56\1\40\1\52\1\44\1\32\1\33\1\47\1\43"+
+    "\1\51\1\4\1\37\1\36\1\41\1\4\1\45\1\34\1\31\1\26"+
+    "\1\55\1\50\1\15\1\53\1\4\1\27\1\66\1\30\54\0\1\4"+
     "\12\0\1\4\4\0\1\4\5\0\27\4\1\0\37\4\1\0\u013f\4"+
     "\31\0\162\4\4\0\14\4\16\0\5\4\11\0\1\4\213\0\1\4"+
     "\13\0\1\4\1\0\3\4\1\0\1\4\1\0\24\4\1\0\54\4"+
@@ -126,21 +127,21 @@ class _JetLexer implements FlexLexer {
     "\1\40\1\41\1\42\1\0\1\43\1\0\1\44\1\0"+
     "\1\45\1\0\1\46\1\47\1\50\1\51\1\52\1\43"+
     "\2\2\1\43\1\53\1\54\1\55\1\56\2\12\1\0"+
-    "\3\3\1\57\1\60\1\61\3\3\1\62\15\3\1\63"+
+    "\3\3\1\57\1\60\1\61\7\3\1\62\10\3\1\63"+
     "\1\0\1\64\1\65\1\66\1\67\1\70\1\71\1\72"+
     "\1\73\1\74\1\75\1\76\1\0\1\77\2\100\1\0"+
     "\1\40\1\101\1\43\1\3\2\0\1\50\1\102\4\0"+
-    "\1\103\4\3\1\104\4\3\1\105\11\3\1\106\1\3"+
-    "\1\107\1\3\1\110\1\111\1\112\1\113\1\114\1\115"+
-    "\2\0\2\40\1\44\1\45\1\0\2\102\1\43\2\0"+
-    "\1\116\1\3\1\117\1\3\1\120\1\3\1\121\1\3"+
-    "\1\122\7\3\1\123\1\3\1\124\1\125\1\76\1\0"+
-    "\1\126\1\50\2\0\1\127\1\130\1\131\3\3\1\132"+
-    "\2\3\1\133\1\134\1\135\1\0\1\103\3\3\1\136"+
-    "\1\137\1\3\1\140\1\3\1\141";
+    "\1\103\4\3\1\104\10\3\1\105\4\3\1\106\1\107"+
+    "\2\3\1\110\1\111\1\112\1\113\1\114\1\115\2\0"+
+    "\2\40\1\44\1\45\1\0\2\102\1\43\2\0\1\116"+
+    "\1\3\1\117\1\3\1\120\4\3\1\121\1\122\4\3"+
+    "\1\123\1\3\1\124\1\125\1\76\1\0\1\126\1\50"+
+    "\2\0\1\127\1\130\1\131\1\3\1\132\3\3\1\133"+
+    "\1\134\1\135\1\0\1\103\1\3\1\136\1\3\1\137"+
+    "\1\3\1\140\1\141";
 
   private static int [] zzUnpackAction() {
-    int [] result = new int[230];
+    int [] result = new int[224];
     int offset = 0;
     offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
     return result;
@@ -165,38 +166,37 @@ class _JetLexer implements FlexLexer {
   private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
 
   private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\101\0\202\0\303\0\u0104\0\u0145\0\u0186\0\u01c7"+
-    "\0\u0208\0\u0249\0\u028a\0\u02cb\0\u030c\0\u034d\0\u038e\0\u03cf"+
-    "\0\u0410\0\u0451\0\u0104\0\u0104\0\u0492\0\u04d3\0\u0514\0\u0555"+
-    "\0\u0596\0\u05d7\0\u0618\0\u0659\0\u069a\0\u06db\0\u071c\0\u075d"+
-    "\0\u079e\0\u07df\0\u0820\0\u0861\0\u08a2\0\u08e3\0\u0104\0\u0924"+
-    "\0\u0965\0\u09a6\0\u09e7\0\u0a28\0\u0a69\0\u0104\0\u0104\0\u0104"+
-    "\0\u0104\0\u0104\0\u0104\0\u0104\0\u0104\0\u0aaa\0\u0104\0\u0aeb"+
-    "\0\u0b2c\0\u0104\0\u0b6d\0\u0bae\0\u0bef\0\u0104\0\u0104\0\u0c30"+
-    "\0\u0c71\0\u0cb2\0\u0cf3\0\u0d34\0\u0d75\0\u0db6\0\u0104\0\u0df7"+
-    "\0\u0e38\0\u0104\0\u0104\0\u0e79\0\u0eba\0\u0efb\0\u0f3c\0\u0104"+
-    "\0\u0104\0\u0104\0\u0104\0\u0104\0\u0f7d\0\u0fbe\0\u0fff\0\u1040"+
-    "\0\u1081\0\u0186\0\u0186\0\u0186\0\u10c2\0\u1103\0\u1144\0\u1185"+
-    "\0\u11c6\0\u1207\0\u1248\0\u1289\0\u12ca\0\u130b\0\u134c\0\u138d"+
-    "\0\u13ce\0\u140f\0\u1450\0\u1491\0\u14d2\0\u0186\0\u1513\0\u1554"+
-    "\0\u1595\0\u0104\0\u0104\0\u0104\0\u0104\0\u0104\0\u0104\0\u0104"+
-    "\0\u0104\0\u15d6\0\u1617\0\u0104\0\u0104\0\u1658\0\u1699\0\u16da"+
-    "\0\u0104\0\u171b\0\u0104\0\u175c\0\u179d\0\u17de\0\u181f\0\u1860"+
-    "\0\u18a1\0\u18e2\0\u1923\0\u1964\0\u19a5\0\u19e6\0\u1a27\0\u1a68"+
-    "\0\u0186\0\u1aa9\0\u1aea\0\u1b2b\0\u1b6c\0\u0104\0\u1bad\0\u1bee"+
-    "\0\u1c2f\0\u1c70\0\u1cb1\0\u1cf2\0\u1d33\0\u1d74\0\u1db5\0\u0186"+
-    "\0\u1df6\0\u0186\0\u1e37\0\u0186\0\u0186\0\u1e78\0\u1e78\0\u0104"+
-    "\0\u0104\0\u1eb9\0\u1efa\0\u0104\0\u1f3b\0\u0104\0\u0104\0\u1f7c"+
-    "\0\u1fbd\0\u0104\0\u1ffe\0\u171b\0\u203f\0\u0186\0\u2080\0\u0186"+
-    "\0\u20c1\0\u0186\0\u2102\0\u0186\0\u2143\0\u0186\0\u2184\0\u21c5"+
-    "\0\u2206\0\u2247\0\u2288\0\u22c9\0\u230a\0\u0186\0\u234b\0\u0186"+
-    "\0\u0104\0\u0104\0\u238c\0\u0b6d\0\u0104\0\u23cd\0\u240e\0\u0186"+
-    "\0\u0186\0\u0186\0\u244f\0\u2490\0\u24d1\0\u0186\0\u2512\0\u2553"+
-    "\0\u0186\0\u0186\0\u0186\0\u2594\0\u0104\0\u25d5\0\u2616\0\u2657"+
-    "\0\u0186\0\u0186\0\u2698\0\u0186\0\u26d9\0\u0186";
+    "\0\0\0\100\0\200\0\300\0\u0100\0\u0140\0\u0180\0\u01c0"+
+    "\0\u0200\0\u0240\0\u0280\0\u02c0\0\u0300\0\u0340\0\u0380\0\u03c0"+
+    "\0\u0400\0\u0440\0\u0100\0\u0100\0\u0480\0\u04c0\0\u0500\0\u0540"+
+    "\0\u0580\0\u05c0\0\u0600\0\u0640\0\u0680\0\u06c0\0\u0700\0\u0740"+
+    "\0\u0780\0\u07c0\0\u0800\0\u0840\0\u0880\0\u08c0\0\u0100\0\u0900"+
+    "\0\u0940\0\u0980\0\u09c0\0\u0a00\0\u0a40\0\u0100\0\u0100\0\u0100"+
+    "\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u0a80\0\u0100\0\u0ac0"+
+    "\0\u0b00\0\u0100\0\u0b40\0\u0b80\0\u0bc0\0\u0100\0\u0100\0\u0c00"+
+    "\0\u0c40\0\u0c80\0\u0cc0\0\u0d00\0\u0d40\0\u0d80\0\u0100\0\u0dc0"+
+    "\0\u0e00\0\u0100\0\u0100\0\u0e40\0\u0e80\0\u0ec0\0\u0f00\0\u0100"+
+    "\0\u0100\0\u0100\0\u0100\0\u0100\0\u0f40\0\u0f80\0\u0fc0\0\u1000"+
+    "\0\u1040\0\u0180\0\u0180\0\u0180\0\u1080\0\u10c0\0\u1100\0\u1140"+
+    "\0\u1180\0\u11c0\0\u1200\0\u1240\0\u1280\0\u12c0\0\u1300\0\u1340"+
+    "\0\u1380\0\u13c0\0\u1400\0\u1440\0\u0180\0\u1480\0\u14c0\0\u1500"+
+    "\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100"+
+    "\0\u1540\0\u1580\0\u0100\0\u0100\0\u15c0\0\u1600\0\u1640\0\u0100"+
+    "\0\u1680\0\u0100\0\u16c0\0\u1700\0\u1740\0\u1780\0\u17c0\0\u1800"+
+    "\0\u1840\0\u1880\0\u18c0\0\u1900\0\u1940\0\u1980\0\u19c0\0\u0180"+
+    "\0\u1a00\0\u1a40\0\u1a80\0\u1ac0\0\u1b00\0\u1b40\0\u1b80\0\u1bc0"+
+    "\0\u0100\0\u1c00\0\u1c40\0\u1c80\0\u1cc0\0\u0180\0\u0180\0\u1d00"+
+    "\0\u1d40\0\u0180\0\u0180\0\u1d80\0\u1d80\0\u0100\0\u0100\0\u1dc0"+
+    "\0\u1e00\0\u0100\0\u1e40\0\u0100\0\u0100\0\u1e80\0\u1ec0\0\u0100"+
+    "\0\u1f00\0\u1680\0\u1f40\0\u0180\0\u1f80\0\u0180\0\u1fc0\0\u0180"+
+    "\0\u2000\0\u2040\0\u2080\0\u20c0\0\u0180\0\u0180\0\u2100\0\u2140"+
+    "\0\u2180\0\u21c0\0\u0180\0\u2200\0\u0180\0\u0100\0\u0100\0\u2240"+
+    "\0\u0b40\0\u0100\0\u2280\0\u22c0\0\u0180\0\u0180\0\u0180\0\u2300"+
+    "\0\u0180\0\u2340\0\u2380\0\u23c0\0\u0180\0\u0180\0\u0180\0\u2400"+
+    "\0\u0100\0\u2440\0\u0180\0\u2480\0\u0180\0\u24c0\0\u0180\0\u0180";
 
   private static int [] zzUnpackRowMap() {
-    int [] result = new int[230];
+    int [] result = new int[224];
     int offset = 0;
     offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
     return result;
@@ -222,251 +222,239 @@ class _JetLexer implements FlexLexer {
     "\1\5\1\6\1\7\1\10\1\7\1\5\1\11\1\10"+
     "\1\12\1\13\1\14\1\15\1\16\2\7\1\17\1\7"+
     "\1\20\1\7\1\21\1\5\1\22\1\7\1\23\1\24"+
-    "\1\25\1\7\1\26\1\27\1\30\1\31\1\7\1\32"+
-    "\1\33\1\34\1\35\2\7\1\36\1\37\1\7\1\40"+
-    "\1\7\1\41\1\7\1\42\1\43\1\44\1\45\1\46"+
-    "\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56"+
-    "\1\57\1\60\1\61\1\62\1\63\1\64\1\65\7\66"+
-    "\1\67\1\70\13\66\1\71\1\72\53\66\2\0\1\73"+
-    "\1\0\1\73\1\0\1\74\6\0\2\73\1\0\1\73"+
-    "\1\0\1\73\3\0\1\73\2\0\1\75\26\73\21\0"+
-    "\1\5\1\6\1\7\1\10\1\7\1\5\1\11\1\10"+
-    "\1\12\1\13\1\14\1\15\1\16\2\7\1\17\1\7"+
-    "\1\20\1\7\1\21\1\5\1\22\1\7\1\76\1\77"+
-    "\1\25\1\7\1\26\1\27\1\30\1\31\1\7\1\32"+
-    "\1\33\1\34\1\35\2\7\1\36\1\37\1\7\1\40"+
-    "\1\7\1\41\1\7\1\42\1\43\1\44\1\45\1\46"+
-    "\1\47\1\50\1\51\1\52\1\53\1\54\1\55\1\56"+
-    "\1\57\1\60\1\61\1\62\1\63\1\64\1\65\102\0"+
-    "\1\6\12\0\1\6\2\0\1\100\1\101\17\0\1\101"+
-    "\41\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\3\0\1\7\2\0\27\7\24\0\1\10"+
-    "\3\0\1\10\71\0\6\102\2\0\71\102\2\0\1\103"+
-    "\1\0\1\103\1\0\1\104\6\0\2\103\1\0\1\103"+
-    "\1\0\1\103\3\0\1\103\2\0\27\103\23\0\1\105"+
-    "\1\0\1\105\1\0\1\106\2\0\1\107\3\0\2\105"+
-    "\1\0\1\105\1\0\1\105\3\0\1\105\2\0\27\105"+
-    "\33\0\1\110\1\111\45\0\1\112\100\0\1\113\20\0"+
-    "\1\114\12\0\1\114\1\115\1\116\1\100\1\101\17\0"+
-    "\1\101\6\0\1\116\32\0\1\117\12\0\1\117\2\0"+
-    "\1\120\102\0\1\121\37\0\1\122\3\0\1\123\13\0"+
-    "\7\21\1\0\13\21\1\124\1\125\54\21\25\0\1\126"+
-    "\54\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\3\0\1\7\2\0\1\7\1\127\13\7"+
-    "\1\130\5\7\1\131\3\7\22\0\2\7\1\0\2\7"+
+    "\1\25\1\7\1\26\1\27\1\30\1\31\1\32\1\33"+
+    "\1\34\1\35\2\7\1\36\1\37\1\7\1\40\1\7"+
+    "\1\41\1\7\1\42\1\43\1\44\1\45\1\46\1\47"+
+    "\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57"+
+    "\1\60\1\61\1\62\1\63\1\64\1\65\7\66\1\67"+
+    "\1\70\13\66\1\71\1\72\52\66\2\0\1\73\1\0"+
+    "\1\73\1\0\1\74\6\0\2\73\1\0\1\73\1\0"+
+    "\1\73\3\0\1\73\2\0\1\75\25\73\21\0\1\5"+
+    "\1\6\1\7\1\10\1\7\1\5\1\11\1\10\1\12"+
+    "\1\13\1\14\1\15\1\16\2\7\1\17\1\7\1\20"+
+    "\1\7\1\21\1\5\1\22\1\7\1\76\1\77\1\25"+
+    "\1\7\1\26\1\27\1\30\1\31\1\32\1\33\1\34"+
+    "\1\35\2\7\1\36\1\37\1\7\1\40\1\7\1\41"+
+    "\1\7\1\42\1\43\1\44\1\45\1\46\1\47\1\50"+
+    "\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60"+
+    "\1\61\1\62\1\63\1\64\1\65\101\0\1\6\12\0"+
+    "\1\6\2\0\1\100\1\101\17\0\1\101\40\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\26\7\24\0\1\10\3\0\1\10"+
+    "\70\0\6\102\2\0\70\102\2\0\1\103\1\0\1\103"+
+    "\1\0\1\104\6\0\2\103\1\0\1\103\1\0\1\103"+
+    "\3\0\1\103\2\0\26\103\23\0\1\105\1\0\1\105"+
+    "\1\0\1\106\2\0\1\107\3\0\2\105\1\0\1\105"+
+    "\1\0\1\105\3\0\1\105\2\0\26\105\33\0\1\110"+
+    "\1\111\44\0\1\112\77\0\1\113\20\0\1\114\12\0"+
+    "\1\114\1\115\1\116\1\100\1\101\17\0\1\101\5\0"+
+    "\1\116\32\0\1\117\12\0\1\117\2\0\1\120\101\0"+
+    "\1\121\36\0\1\122\3\0\1\123\13\0\7\21\1\0"+
+    "\13\21\1\124\1\125\53\21\25\0\1\126\53\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\1\7\1\127\12\7\1\130\5\7"+
+    "\1\131\3\7\22\0\2\7\1\0\2\7\6\0\3\7"+
+    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\3\7"+
+    "\1\132\2\7\1\133\12\7\1\134\4\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\135\2\0\26\7\22\0\2\7\1\0\2\7"+
     "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
-    "\2\0\3\7\1\132\1\133\15\7\1\134\4\7\22\0"+
-    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\3\0\1\135\2\0\27\7\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\3\0"+
-    "\1\136\2\0\5\7\1\137\21\7\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\3\0"+
-    "\1\7\2\0\3\7\1\140\23\7\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\3\0"+
-    "\1\7\2\0\21\7\1\141\5\7\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\3\0"+
-    "\1\7\2\0\5\7\1\142\21\7\22\0\2\7\1\0"+
+    "\2\0\5\7\1\136\12\7\1\137\5\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\15\7\1\140\10\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\141\2\0\26\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\20\7\1\142\5\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\11\7\1\143\14\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\3\7\1\144\22\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\7\7\1\145\16\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\14\7\1\146\11\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\1\7\1\147\24\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\150"+
+    "\2\0\5\7\1\151\3\7\1\152\14\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\1\7\1\153\24\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\11\7\1\154\14\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\5\7\1\155\20\7\54\0\1\156"+
+    "\24\0\1\157\77\0\1\160\3\0\1\161\73\0\1\162"+
+    "\1\0\1\163\75\0\1\164\77\0\1\165\104\0\1\166"+
+    "\100\0\1\167\71\0\1\170\17\0\7\66\2\0\13\66"+
+    "\2\0\52\66\2\0\1\171\1\0\1\171\1\0\1\172"+
+    "\6\0\2\171\1\0\1\171\1\0\1\171\3\0\1\171"+
+    "\1\173\1\0\26\171\21\0\7\174\1\0\16\174\1\175"+
+    "\51\174\1\0\2\73\1\0\2\73\6\0\3\73\1\0"+
+    "\1\73\1\0\1\73\3\0\1\73\2\0\26\73\21\0"+
+    "\6\176\2\0\70\176\1\0\2\73\1\0\2\73\6\0"+
+    "\3\73\1\0\1\73\1\0\1\73\3\0\1\73\2\0"+
+    "\1\73\1\177\24\73\22\0\1\117\12\0\1\117\2\0"+
+    "\1\200\61\0\1\201\12\0\1\201\4\0\1\201\40\0"+
+    "\1\201\15\0\6\102\1\202\1\0\70\102\1\0\2\103"+
+    "\1\0\2\103\6\0\3\103\1\0\1\103\1\0\1\103"+
+    "\3\0\1\103\2\0\26\103\21\0\6\203\2\0\70\203"+
+    "\1\0\2\105\1\0\2\105\6\0\3\105\1\0\1\105"+
+    "\1\0\1\105\3\0\1\105\2\0\26\105\21\0\6\204"+
+    "\2\0\70\204\7\110\1\0\70\110\13\205\1\206\64\205"+
+    "\1\0\1\114\12\0\1\114\2\0\1\207\1\101\17\0"+
+    "\1\101\40\0\2\115\11\0\1\115\1\0\1\115\1\210"+
+    "\1\115\1\0\1\211\12\0\1\115\2\0\1\115\1\211"+
+    "\1\115\3\0\1\115\3\0\1\115\3\0\1\115\22\0"+
+    "\1\116\12\0\1\116\2\0\1\212\61\0\1\117\12\0"+
+    "\1\117\3\0\1\101\17\0\1\101\37\0\7\21\1\0"+
+    "\70\21\25\0\1\213\53\0\2\7\1\0\2\7\6\0"+
+    "\3\7\1\0\1\7\1\0\1\7\3\0\1\7\2\0"+
+    "\2\7\1\214\11\7\1\215\11\7\22\0\2\7\1\0"+
     "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\3\0"+
-    "\1\7\2\0\12\7\1\143\6\7\1\144\5\7\22\0"+
+    "\1\216\2\0\11\7\1\217\10\7\1\220\3\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\10\7\1\221\15\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\10\7\1\222\15\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\6\7\1\223\17\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\11\7\1\224\14\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\16\7\1\225\7\7\22\0"+
     "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\3\0\1\7\2\0\16\7\1\145\10\7\22\0"+
+    "\1\7\3\0\1\7\2\0\20\7\1\226\5\7\22\0"+
     "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\3\0\1\7\2\0\7\7\1\146\17\7\22\0"+
+    "\1\7\3\0\1\7\2\0\3\7\1\227\22\7\22\0"+
     "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\3\0\1\7\2\0\15\7\1\147\11\7\22\0"+
+    "\1\7\3\0\1\7\2\0\4\7\1\230\21\7\22\0"+
     "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\3\0\1\7\2\0\1\7\1\150\25\7\22\0"+
+    "\1\7\3\0\1\7\2\0\26\7\2\0\1\231\17\0"+
     "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\3\0\1\151\2\0\5\7\1\152\4\7\1\153"+
-    "\14\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\1\7\1\154"+
-    "\25\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\5\7\1\155"+
-    "\21\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\12\7\1\156"+
-    "\14\7\54\0\1\157\25\0\1\160\100\0\1\161\3\0"+
-    "\1\162\74\0\1\163\1\0\1\164\76\0\1\165\100\0"+
-    "\1\166\105\0\1\167\101\0\1\170\72\0\1\171\17\0"+
-    "\7\66\2\0\13\66\2\0\53\66\2\0\1\172\1\0"+
-    "\1\172\1\0\1\173\6\0\2\172\1\0\1\172\1\0"+
-    "\1\172\3\0\1\172\1\174\1\0\27\172\21\0\7\175"+
-    "\1\0\16\175\1\176\52\175\1\0\2\73\1\0\2\73"+
-    "\6\0\3\73\1\0\1\73\1\0\1\73\3\0\1\73"+
-    "\2\0\27\73\21\0\6\177\2\0\71\177\1\0\2\73"+
-    "\1\0\2\73\6\0\3\73\1\0\1\73\1\0\1\73"+
-    "\3\0\1\73\2\0\1\73\1\200\25\73\22\0\1\117"+
-    "\12\0\1\117\2\0\1\201\62\0\1\202\12\0\1\202"+
-    "\4\0\1\202\41\0\1\202\15\0\6\102\1\203\1\0"+
-    "\71\102\1\0\2\103\1\0\2\103\6\0\3\103\1\0"+
-    "\1\103\1\0\1\103\3\0\1\103\2\0\27\103\21\0"+
-    "\6\204\2\0\71\204\1\0\2\105\1\0\2\105\6\0"+
-    "\3\105\1\0\1\105\1\0\1\105\3\0\1\105\2\0"+
-    "\27\105\21\0\6\205\2\0\71\205\7\110\1\0\71\110"+
-    "\13\206\1\207\65\206\1\0\1\114\12\0\1\114\2\0"+
-    "\1\210\1\101\17\0\1\101\41\0\2\115\11\0\1\115"+
-    "\1\0\1\115\1\211\1\115\1\0\1\212\13\0\1\115"+
-    "\1\0\1\115\1\212\1\115\4\0\1\115\3\0\1\115"+
-    "\3\0\1\115\22\0\1\116\12\0\1\116\2\0\1\213"+
-    "\62\0\1\117\12\0\1\117\3\0\1\101\17\0\1\101"+
-    "\40\0\7\21\1\0\71\21\25\0\1\214\54\0\2\7"+
+    "\1\7\3\0\1\7\2\0\1\232\25\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\2\7\1\215\12\7\1\216\11\7"+
+    "\3\0\1\7\2\0\7\7\1\233\16\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\2\7\1\234\4\7\1\235\16\7"+
     "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\3\0\1\217\2\0\5\7\1\220\15\7"+
-    "\1\221\3\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\10\7"+
-    "\1\222\16\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\10\7"+
-    "\1\223\16\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\21\7"+
-    "\1\224\5\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\6\7"+
-    "\1\225\20\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\27\7"+
-    "\2\0\1\226\17\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\3\7"+
-    "\1\227\23\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\11\7"+
-    "\1\230\15\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\4\7"+
-    "\1\231\22\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\5\7"+
-    "\1\232\21\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\17\7"+
-    "\1\233\7\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\1\234"+
-    "\26\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\7\7\1\235"+
-    "\17\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\2\7\1\236"+
-    "\4\7\1\237\17\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\3\0\1\7\2\0"+
-    "\4\7\1\240\22\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\3\0\1\7\2\0"+
-    "\21\7\1\241\5\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\3\0\1\7\2\0"+
-    "\15\7\1\242\11\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\3\0\1\7\2\0"+
-    "\2\7\1\243\24\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\3\0\1\7\2\0"+
-    "\15\7\1\244\3\7\1\245\5\7\55\0\1\246\1\247"+
-    "\124\0\1\250\100\0\1\251\20\0\2\172\1\0\2\172"+
-    "\6\0\3\172\1\0\1\172\1\0\1\172\3\0\1\172"+
-    "\2\0\27\172\21\0\6\252\2\0\71\252\1\0\2\253"+
-    "\11\0\1\253\1\0\1\253\1\0\1\253\15\0\1\253"+
-    "\1\0\1\253\1\0\1\253\4\0\1\253\3\0\1\253"+
-    "\3\0\1\253\21\0\6\177\1\254\1\0\71\177\1\0"+
-    "\2\73\1\0\2\73\6\0\3\73\1\0\1\73\1\0"+
-    "\1\73\3\0\1\73\2\0\2\73\1\255\24\73\22\0"+
-    "\1\202\12\0\1\202\64\0\6\204\1\256\1\0\71\204"+
-    "\6\205\1\257\1\0\71\205\13\206\1\260\65\206\12\261"+
-    "\1\262\1\207\65\261\1\0\1\117\12\0\1\117\65\0"+
-    "\2\263\11\0\1\263\1\0\1\263\1\201\1\263\15\0"+
-    "\1\263\1\0\1\263\1\0\1\263\4\0\1\263\3\0"+
-    "\1\263\3\0\1\263\22\0\1\202\12\0\1\202\4\0"+
-    "\1\264\41\0\1\264\34\0\1\201\61\0\25\214\1\265"+
-    "\53\214\1\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\3\7\1\266"+
-    "\23\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\12\7\1\267"+
-    "\14\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\7\7\1\270"+
-    "\17\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\2\7\1\271"+
-    "\24\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\7\7\1\272"+
-    "\17\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\7\7\1\273"+
-    "\17\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\21\7\1\274"+
-    "\5\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\7\7\1\275"+
-    "\17\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\7\7\1\276"+
-    "\17\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\13\7\1\277"+
-    "\13\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\1\300\26\7"+
+    "\1\0\1\7\3\0\1\7\2\0\6\7\1\236\17\7"+
     "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\3\0\1\7\2\0\3\7\1\301\23\7"+
+    "\1\0\1\7\3\0\1\7\2\0\14\7\1\237\11\7"+
     "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\3\0\1\7\2\0\7\7\1\302\17\7"+
+    "\1\0\1\7\3\0\1\7\2\0\20\7\1\240\5\7"+
     "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\3\0\1\303\2\0\27\7\22\0\2\7"+
-    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\5\7\1\304\21\7\22\0\2\7"+
-    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\21\7\1\305\5\7\22\0\2\7"+
-    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\4\7\1\306\22\7\22\0\2\7"+
-    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\3\7\1\307\23\7\22\0\2\7"+
-    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\3\7\1\310\23\7\22\0\2\311"+
-    "\1\0\2\311\6\0\3\311\1\0\1\311\1\0\1\311"+
-    "\3\0\1\311\2\0\27\311\21\0\6\252\1\312\1\0"+
-    "\71\252\1\0\2\313\11\0\1\313\1\0\1\313\1\0"+
-    "\1\313\15\0\1\313\1\0\1\313\1\0\1\313\4\0"+
-    "\1\313\3\0\1\313\3\0\1\313\22\0\2\73\1\0"+
+    "\1\0\1\7\3\0\1\7\2\0\2\7\1\241\23\7"+
+    "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
+    "\1\0\1\7\3\0\1\7\2\0\14\7\1\242\3\7"+
+    "\1\243\5\7\55\0\1\244\2\0\1\245\120\0\1\246"+
+    "\77\0\1\247\20\0\2\171\1\0\2\171\6\0\3\171"+
+    "\1\0\1\171\1\0\1\171\3\0\1\171\2\0\26\171"+
+    "\21\0\6\250\2\0\70\250\1\0\2\251\11\0\1\251"+
+    "\1\0\1\251\1\0\1\251\14\0\1\251\2\0\1\251"+
+    "\1\0\1\251\3\0\1\251\3\0\1\251\3\0\1\251"+
+    "\21\0\6\176\1\252\1\0\70\176\1\0\2\73\1\0"+
     "\2\73\6\0\3\73\1\0\1\73\1\0\1\73\3\0"+
-    "\1\73\2\0\3\73\1\314\23\73\21\0\12\206\1\315"+
-    "\1\260\65\206\13\261\1\316\65\261\1\0\2\263\11\0"+
-    "\1\263\1\0\1\263\1\0\1\263\1\0\1\212\13\0"+
-    "\1\263\1\0\1\263\1\212\1\263\4\0\1\263\3\0"+
-    "\1\263\3\0\1\263\21\0\25\214\1\317\53\214\1\0"+
+    "\1\73\2\0\2\73\1\253\23\73\22\0\1\201\12\0"+
+    "\1\201\63\0\6\203\1\254\1\0\70\203\6\204\1\255"+
+    "\1\0\70\204\13\205\1\256\64\205\12\257\1\260\1\206"+
+    "\64\257\1\0\1\117\12\0\1\117\64\0\2\261\11\0"+
+    "\1\261\1\0\1\261\1\200\1\261\14\0\1\261\2\0"+
+    "\1\261\1\0\1\261\3\0\1\261\3\0\1\261\3\0"+
+    "\1\261\22\0\1\201\12\0\1\201\4\0\1\262\40\0"+
+    "\1\262\34\0\1\200\60\0\25\213\1\263\52\213\1\0"+
     "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\3\0\1\7\2\0\20\7\1\320\6\7\22\0"+
+    "\1\7\3\0\1\7\2\0\3\7\1\264\22\7\22\0"+
     "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\3\0\1\7\2\0\1\321\26\7\22\0\2\7"+
-    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\15\7\1\322\11\7\22\0\2\7"+
-    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\3\7\1\323\23\7\22\0\2\7"+
-    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\5\7\1\324\21\7\22\0\2\7"+
-    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\2\7\1\325\24\7\22\0\2\7"+
+    "\1\7\3\0\1\7\2\0\5\7\1\265\20\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\7\7\1\266\16\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\2\7\1\267\23\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\7\7\1\270\16\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\7\7\1\271\16\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\1\272\25\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\3\7\1\326\23\7\22\0\2\7"+
+    "\3\0\1\7\2\0\3\7\1\273\22\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\11\7\1\327\15\7\22\0\2\7"+
+    "\3\0\1\7\2\0\7\7\1\274\16\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\15\7\1\330\11\7\22\0\2\7"+
+    "\3\0\1\7\2\0\20\7\1\275\5\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\13\7\1\331\13\7\22\0\2\7"+
+    "\3\0\1\7\2\0\7\7\1\276\16\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\7\7\1\332\17\7\22\0\2\7"+
+    "\3\0\1\7\2\0\12\7\1\277\13\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\3\0\1\7\2\0\7\7\1\333\17\7\22\0\2\334"+
-    "\11\0\1\334\1\0\1\334\1\0\1\334\15\0\1\334"+
-    "\1\0\1\334\1\0\1\334\4\0\1\334\3\0\1\334"+
-    "\3\0\1\334\21\0\12\261\1\262\1\316\65\261\25\214"+
-    "\1\335\53\214\1\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\10\7"+
-    "\1\336\16\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\14\7"+
-    "\1\337\12\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\4\7"+
-    "\1\340\22\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\1\341"+
-    "\26\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\3\0\1\7\2\0\4\7\1\342"+
-    "\22\7\22\0\2\175\11\0\1\175\1\0\1\175\1\0"+
-    "\1\175\15\0\1\175\1\0\1\175\1\0\1\175\4\0"+
-    "\1\175\3\0\1\175\3\0\1\175\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\3\0"+
-    "\1\7\2\0\5\7\1\343\21\7\22\0\2\7\1\0"+
+    "\3\0\1\300\2\0\26\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\11\7\1\301\14\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\20\7\1\302\5\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\6\7\1\303\17\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\3\7\1\304\22\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\3\7\1\305\22\7\22\0\2\306\1\0\2\306"+
+    "\6\0\3\306\1\0\1\306\1\0\1\306\3\0\1\306"+
+    "\2\0\26\306\21\0\6\250\1\307\1\0\70\250\1\0"+
+    "\2\310\11\0\1\310\1\0\1\310\1\0\1\310\14\0"+
+    "\1\310\2\0\1\310\1\0\1\310\3\0\1\310\3\0"+
+    "\1\310\3\0\1\310\22\0\2\73\1\0\2\73\6\0"+
+    "\3\73\1\0\1\73\1\0\1\73\3\0\1\73\2\0"+
+    "\3\73\1\311\22\73\21\0\12\205\1\312\1\256\64\205"+
+    "\13\257\1\313\64\257\1\0\2\261\11\0\1\261\1\0"+
+    "\1\261\1\0\1\261\1\0\1\211\12\0\1\261\2\0"+
+    "\1\261\1\211\1\261\3\0\1\261\3\0\1\261\3\0"+
+    "\1\261\21\0\25\213\1\314\52\213\1\0\2\7\1\0"+
     "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\3\0"+
-    "\1\7\2\0\7\7\1\344\17\7\22\0\2\7\1\0"+
+    "\1\7\2\0\17\7\1\315\6\7\22\0\2\7\1\0"+
     "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\3\0"+
-    "\1\345\2\0\27\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\3\0\1\7\2\0"+
-    "\11\7\1\337\15\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\3\0\1\7\2\0"+
-    "\7\7\1\346\17\7\21\0";
+    "\1\7\2\0\1\316\25\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\14\7\1\317\11\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\2\7\1\320\23\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\3\7\1\321\22\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\4\7\1\322\21\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\11\7\1\323\14\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\14\7\1\324\11\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\12\7\1\325\13\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\7\7\1\326\16\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\7\7\1\327\16\7\22\0\2\330\11\0\1\330"+
+    "\1\0\1\330\1\0\1\330\14\0\1\330\2\0\1\330"+
+    "\1\0\1\330\3\0\1\330\3\0\1\330\3\0\1\330"+
+    "\21\0\12\257\1\260\1\313\64\257\25\213\1\331\52\213"+
+    "\1\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
+    "\1\0\1\7\3\0\1\7\2\0\6\7\1\332\17\7"+
+    "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
+    "\1\0\1\7\3\0\1\7\2\0\1\333\25\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\13\7\1\334\12\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\6\7\1\335\17\7\22\0"+
+    "\2\174\11\0\1\174\1\0\1\174\1\0\1\174\14\0"+
+    "\1\174\2\0\1\174\1\0\1\174\3\0\1\174\3\0"+
+    "\1\174\3\0\1\174\22\0\2\7\1\0\2\7\6\0"+
+    "\3\7\1\0\1\7\1\0\1\7\3\0\1\336\2\0"+
+    "\26\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
+    "\1\7\1\0\1\7\3\0\1\7\2\0\7\7\1\337"+
+    "\16\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
+    "\1\7\1\0\1\7\3\0\1\7\2\0\7\7\1\340"+
+    "\16\7\21\0";
 
   private static int [] zzUnpackTrans() {
-    int [] result = new int[10010];
+    int [] result = new int[9472];
     int offset = 0;
     offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
     return result;
@@ -510,15 +498,15 @@ class _JetLexer implements FlexLexer {
     "\4\0\1\11\15\1\2\11\22\1\1\11\6\1\10\11"+
     "\1\1\1\11\1\1\1\0\1\11\1\1\1\0\1\1"+
     "\2\11\1\0\1\1\1\0\1\1\1\0\1\1\1\0"+
-    "\1\11\2\1\2\11\4\1\5\11\1\1\1\0\30\1"+
+    "\1\11\2\1\2\11\4\1\5\11\1\1\1\0\27\1"+
     "\1\0\2\1\10\11\1\1\1\0\2\11\1\1\1\0"+
-    "\1\1\1\11\1\1\1\11\2\0\2\1\4\0\12\1"+
-    "\1\11\21\1\2\11\2\0\1\11\1\1\2\11\1\0"+
-    "\1\1\1\11\1\1\2\0\23\1\2\11\1\0\1\1"+
-    "\1\11\2\0\14\1\1\0\1\11\11\1";
+    "\1\1\1\11\1\1\1\11\2\0\2\1\4\0\16\1"+
+    "\1\11\14\1\2\11\2\0\1\11\1\1\2\11\1\0"+
+    "\1\1\1\11\1\1\2\0\22\1\2\11\1\0\1\1"+
+    "\1\11\2\0\13\1\1\0\1\11\7\1";
 
   private static int [] zzUnpackAttribute() {
-    int [] result = new int[230];
+    int [] result = new int[224];
     int offset = 0;
     offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
     return result;

compiler/testData/codegen/regressions/kt857.jet

-namespace container_test
+package container_test
 
 class Container<T>(var t : T) {
     fun getT() : T = t

compiler/testData/compiler/smoke/Smoke.kt

-namespace Smoke
+package Smoke
 
 import std.io.*
 

compiler/testData/diagnostics/tests/NamespaceAsExpression.jet

@@ -5,4 +5,4 @@ package a {
 }
 
 val x = <!EXPRESSION_EXPECTED_NAMESPACE_FOUND!>a<!>
-val y2 = <!NAMESPACE_IS_NOT_AN_EXPRESSION!>namespace<!>
+val y2 = <!NAMESPACE_IS_NOT_AN_EXPRESSION!>package<!>

compiler/testData/diagnostics/tests/ShiftFunctionTypes.jet

 class A {
 }
 
-namespace n {
+package n {
   class B
 }
 abstract class XXX() {
     abstract val a : Int
-    abstract val a1 : namespace.<!UNRESOLVED_REFERENCE!>Int<!>
+    abstract val a1 : package.<!UNRESOLVED_REFERENCE!>Int<!>
     abstract val a2 : n.B
     abstract val a3 : (A)
     abstract val a31 : (n.B)

compiler/testData/diagnostics/tests/scopes/Imports.jet

 //FILE:a.kt
-namespace a
+package a
 
 import b.B        //class
 import b.foo      //function
@@ -14,7 +14,7 @@ fun test(arg: B) {
 }
 
 //FILE:b.kt
-namespace b
+package b
 
 class B() {}
 

compiler/testData/psi/Imports.jet

 package foo.bar.goo
 
-import namespace.foo
+import package.foo
 import foo
 import foo.bar
 import foo as bar

compiler/testData/psi/Imports.txt

@@ -14,7 +14,7 @@ JetFile: Imports.jet
     IMPORT_DIRECTIVE
       PsiElement(import)('import')
       PsiWhiteSpace(' ')
-      PsiElement(namespace)('namespace')
+      PsiElement(namespace)('package')
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
         PsiElement(IDENTIFIER)('foo')

compiler/testData/psi/Imports_ERR.jet

 package foo.bar.goo
 
-import namespace ;
-import namespace.*
-import namespace. ;
+import package ;
+import package.*
+import package. ;
 
 import foo as
 import foo.

compiler/testData/psi/Imports_ERR.txt

@@ -14,7 +14,7 @@ JetFile: Imports_ERR.jet
     IMPORT_DIRECTIVE
       PsiElement(import)('import')
       PsiWhiteSpace(' ')
-      PsiElement(namespace)('namespace')
+      PsiElement(namespace)('package')
       PsiErrorElement:Expecting '.'
         <empty list>
       PsiWhiteSpace(' ')
@@ -26,7 +26,7 @@ JetFile: Imports_ERR.jet
     IMPORT_DIRECTIVE
       PsiElement(import)('import')
       PsiWhiteSpace(' ')
-      PsiElement(namespace)('namespace')
+      PsiElement(namespace)('package')
       PsiElement(DOT)('.')
       REFERENCE_EXPRESSION
         PsiErrorElement:Expecting qualified name
@@ -37,7 +37,7 @@ JetFile: Imports_ERR.jet
     IMPORT_DIRECTIVE
       PsiElement(import)('import')
       PsiWhiteSpace(' ')
-      PsiElement(namespace)('namespace')
+      PsiElement(namespace)('package')
       PsiElement(DOT)('.')
       PsiWhiteSpace(' ')
       REFERENCE_EXPRESSION

compiler/testData/psi/RootNamespace.jet

@@ -4,10 +4,10 @@ class X
 
 package foo.bar {
   fun foo() {
-    namespace.foo.bar.X
-    namespace.foo.bar.X()
+    package.foo.bar.X
+    package.foo.bar.X()
     when (e) {
-      is namespace.foo.bar.X  #(x) -> {}
+      is package.foo.bar.X  #(x) -> {}
     }
   }
 }
\ No newline at end of file

compiler/testData/psi/RootNamespace.txt

@@ -43,7 +43,7 @@ JetFile: RootNamespace.jet
               DOT_QUALIFIED_EXPRESSION
                 DOT_QUALIFIED_EXPRESSION
                   ROOT_NAMESPACE
-                    PsiElement(namespace)('namespace')
+                    PsiElement(namespace)('package')
                   PsiElement(DOT)('.')
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('foo')
@@ -58,7 +58,7 @@ JetFile: RootNamespace.jet
               DOT_QUALIFIED_EXPRESSION
                 DOT_QUALIFIED_EXPRESSION
                   ROOT_NAMESPACE
-                    PsiElement(namespace)('namespace')
+                    PsiElement(namespace)('package')
                   PsiElement(DOT)('.')
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('foo')
@@ -92,7 +92,7 @@ JetFile: RootNamespace.jet
                       DOT_QUALIFIED_EXPRESSION
                         DOT_QUALIFIED_EXPRESSION
                           ROOT_NAMESPACE
-                            PsiElement(namespace)('namespace')
+                            PsiElement(namespace)('package')
                           PsiElement(DOT)('.')
                           REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('foo')

compiler/testData/psi/When.jet

@@ -45,7 +45,7 @@ fun foo() {
     is a  #(a, b) -> c
     is a.a  #(a, b) -> c
     is a.a  #(foo = a, bar = b) -> c
-    is namespace.a.a  #(a, b) -> c
+    is package.a.a  #(a, b) -> c
     is a  #(val a is T, b) -> c
     is a  #(b, 1) -> c
     in 1..2 -> dsf

compiler/testData/psi/When.txt

@@ -599,7 +599,7 @@ JetFile: When.jet
                 DOT_QUALIFIED_EXPRESSION
                   DOT_QUALIFIED_EXPRESSION
                     ROOT_NAMESPACE
-                      PsiElement(namespace)('namespace')
+                      PsiElement(namespace)('package')
                     PsiElement(DOT)('.')
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('a')

compiler/testData/psi/greatSyntacticShift/functionTypes.jet

 class A {
 }
 
-namespace n {
+package n {
   class B
 }
 abstract class XXX() {

compiler/testData/readClass/class/Class.kt

-namespace test
+package test
 
 class Ramification

compiler/testData/readClass/class/ClassInParam.kt

-namespace test
+package test
 
 class Wine<in T>

compiler/testData/readClass/class/ClassOutParam.kt

-namespace test
+package test
 
 class Juice<in T>

compiler/testData/readClass/class/ClassParam.kt

-namespace test
+package test
 
 class Beer<T>

compiler/testData/readClass/class/ClassParamUpperClassBound.kt

-namespace test
+package test
 
 class Clock<A : java.lang.Number>

compiler/testData/readClass/class/ClassParamUpperClassInterfaceBound.kt

-namespace test
+package test
 
 class Clock<A> where A : java.lang.Number, A : java.lang.CharSequence

compiler/testData/readClass/class/ClassParamUpperInterfaceBound.kt

-namespace test
+package test
 
 class Clock<A : java.lang.CharSequence>

compiler/testData/readClass/class/ClassParamUpperInterfaceClassBound.kt

-namespace test
+package test
 
 class Clock<A> where A : java.lang.CharSequence, A : java.lang.Number

compiler/testData/readClass/class/Trait.kt

-namespace test
+package test
 
 trait Trtrtr

compiler/testData/readClass/fun/ClassFun.kt

-namespace test
+package test
 
 class River {
     fun song() = 1

compiler/testData/readClass/fun/ExtFun.kt

-namespace test
+package test
 
 fun Int.shuffle() = 1

compiler/testData/readClass/fun/ExtFunInClass.kt

-namespace test
+package test
 
 class ExtFunInClass {
     fun Int.shuffle() = 1

compiler/testData/readClass/fun/FunClassParamNotNull.kt

-namespace test
+package test
 
 import java.util.List
 import java.lang.CharSequence

compiler/testData/readClass/fun/FunClassParamNullable.kt

-namespace test
+package test
 
 import java.util.List
 import java.lang.CharSequence

compiler/testData/readClass/fun/FunDefaultArg.kt

-namespace test
+package test
 
 fun funDefaultArg(p: Int, q: Int = 17, r: Int = 18) = 19

compiler/testData/readClass/fun/FunGenericParam.kt

-namespace test
+package test
 
 fun <T> f() = 1

compiler/testData/readClass/fun/FunInParam.kt

-namespace test
+package test
 
 fun <in T> f() = 1

compiler/testData/readClass/fun/FunOutParam.kt

-namespace test
+package test
 
 fun <out T> f() = 1

compiler/testData/readClass/fun/FunParamNotNull.kt

-namespace test
+package test
 
 fun fff(a: java.lang.CharSequence) = 1

compiler/testData/readClass/fun/FunParamNullable.kt

-namespace test
+package test
 
 fun fff(a: java.lang.CharSequence?) = 1

compiler/testData/readClass/fun/FunParamUpperClassBound.kt

-namespace test
+package test
 
 fun <A : java.lang.Number> uno() = 1

compiler/testData/readClass/fun/FunParamUpperClassInterfaceBound.kt

-namespace test
+package test
 
 fun <A> tres() where A : java.lang.Number, A : java.lang.CharSequence = 1

compiler/testData/readClass/fun/FunParamUpperInterfaceBound.kt

-namespace test
+package test
 
 fun <A : java.lang.CharSequence> dos() = 1

compiler/testData/readClass/fun/FunParamUpperInterfaceClassBound.kt

-namespace test
+package test
 
 fun <A> cuatro() where A : java.lang.CharSequence, A : java.lang.Number = 1

compiler/testData/readClass/fun/FunVarargCharSequence.kt

-namespace test
+package test
 
 fun varargCharSequence(a: Int, vararg b: java.lang.CharSequence) = 1

compiler/testData/readClass/fun/FunVarargInt.kt

-namespace test
+package test
 
 fun varargInt(a: Int, vararg b: Int) = 1

compiler/testData/readClass/fun/ModifierAbstract.kt

-namespace test
+package test
 
 abstract class ModifierAbstract {
     abstract fun abs(): Int

compiler/testData/readClass/fun/ModifierOpen.kt

-namespace test
+package test
 
 open class ModifierOpen {
     open fun abs() = 1

compiler/testData/readClass/fun/NsFun.kt

-namespace test
+package test
 
 fun f() = 1

compiler/testData/readClass/fun/ReturnTypeClassParamNotNull.kt

-namespace test
+package test
 
 import java.util.List
 import java.util.ArrayList

compiler/testData/readClass/fun/ReturnTypeClassParamNullable.kt

-namespace test
+package test
 
 import java.util.List
 import java.util.ArrayList

compiler/testData/readClass/fun/ReturnTypeNotNull.kt

-namespace test
+package test
 
 fun ff(): java.lang.CharSequence = throw Exception()

compiler/testData/readClass/fun/ReturnTypeNullable.kt

-namespace test
+package test
 
 fun ff(): java.lang.CharSequence? = null

compiler/testData/resolve/ClassObjects.jet

-namespace Jet86
+package Jet86
 
 ~A~class A {
   class object {

compiler/testData/resolve/Classifiers.jet

-namespace qualified_this {
+package qualified_this {
     ~qtA~class A(val a:Int) {
 
       ~qtB~class B() {

compiler/testData/resolve/LocalObjects.jet

-namespace localObjects {
+package localObjects {
   object ~A~A {
     ~x~val x : Int
   }

compiler/testData/resolve/Namespaces.jet

-namespace root
+package root
 
-~a~namespace a {
+~a~package a {
     import java.*
 
     ~a.a~val a : util.List<Int>? = null
@@ -9,7 +9,7 @@ namespace root
 
 }
 
-namespace a {
+package a {
     import java.util.*
 
     ~a.b~val b : List<Int>? = null

compiler/testData/resolve/NestedObjects.jet

-~ns~namespace nestedObjects {
+~ns~package nestedObjects {
   object ~A~A {
     val b = `A.B`B
     val d = `A`A.`A.B`B.`A.B.A`A

compiler/testData/resolve/Objects.jet

-namespace toplevelObjectDeclarations {
+package toplevelObjectDeclarations {
   class Foo(y : Int) {
     ~foo()~open fun foo() : Int = 1
   }

compiler/testData/resolve/PrimaryConstructors.jet

@@ -11,7 +11,7 @@ fun test() {
     a.`f`f()`:std::Int`
 }
 
-namespace Jet65 {
+package Jet65 {
 
   class Foo(~bar~var bar : Int, ~barr~barr : Int, ~barrr~val barrr : Int) {
     {

examples/src/Bottles.kt

-namespace bottles;
+package bottles;
 
 fun main(args: Array<String>) {
     var bottles: Int = 99;

examples/src/Generics.jet

-namespace generics;
+package generics;
 
 import java.util.*
 

examples/src/HelloNames.kt

-namespace HelloNames
+package HelloNames
 
 fun main(args : Array<String>) {
     var names = ""

examples/src/HelloNamesFaster.kt

-namespace HelloNamesFaster
+package HelloNamesFaster
 
 fun main(args : Array<String>) {
     var names = StringBuilder()

examples/src/HelloNamesRealistic.kt

-namespace HelloNamesRealistic
+package HelloNamesRealistic
 
 fun main(args : Array<String>) {
     val names = args.join(", ")

examples/src/JavaInterop.jet

-namespace JavaInterop
+package JavaInterop
 
 import java.util.*
 

examples/src/NullSafety.jet

-namespace NullSafety
+package NullSafety
 
 fun <T : Any> T?.npe() : T =
   if (this == null)

examples/src/benchmarks/FList.kt

-namespace flist
+package flist
 
 abstract class FList<T> {
     abstract val head : T

examples/src/benchmarks/LockPerf.kt

-namespace lockperformance
+package lockperformance
 
 import std.io.*
 import std.util.*

examples/src/benchmarks/Quicksort.kt

-namespace quicksort
+package quicksort
 
 fun IntArray.swap(i:Int, j:Int) {
     val temp = this[i]

examples/src/benchmarks/SpectralNorm.kt

-namespace spectralnorm
+package spectralnorm
 
 import java.text.DecimalFormat;
 import java.text.NumberFormat;

examples/src/benchmarks/ThreadRing.kt

-namespace threadring
+package threadring
 
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;

examples/src/collections/IIterable.kt

-namespace jet.collections.iterable
+package jet.collections.iterable
 
 import jet.collections.iterator.IIterator
 

examples/src/collections/ISet.kt

-namespace jet.collections.set
+package jet.collections.set
 
 import jet.collections.sized.ISized
 import jet.collections.iterable.IIterable

examples/src/collections/ISized.kt

-namespace jet.collections.sized
+package jet.collections.sized
 
 trait ISized {
   val size : Int

examples/src/collections/Iterator.kt

-namespace jet.collections
+package jet.collections
 
 import java.util.NoSuchElementException
 

examples/src/netty/netty.kt

@@ -16,7 +16,7 @@ import org.jboss.netty.handler.codec.http.HttpResponseStatus.*
 import netty.*
 import jlstring.*
 
-namespace jlstring {
+package jlstring {
     fun String.replace(c: Char, by: Char) : String = (this as java.lang.String).replace(c, by) as String
 
     fun String.contains(s: String) : Boolean = (this as java.lang.String).contains(s as java.lang.CharSequence)
@@ -24,7 +24,7 @@ namespace jlstring {
     fun java.lang.String.plus(s: Any?) : String = (this as String) + s.toString()
 }
 
-namespace netty {
+package netty {
     fun ChannelPipeline.with(op: fun ChannelPipeline.() ) : ChannelPipeline {
         this.op()
         return this

idea/testData/checker/Abstract.jet

-namespace abstract
+package abstract
 
 class MyClass() {
     //properties
@@ -118,7 +118,7 @@ enum class MyEnum() {
 
 abstract enum class MyAbstractEnum() {}
 
-namespace MyNamespace {
+package MyNamespace {
     //properties
     val <error>a</error>: Int
     val a1: Int = 1

idea/testData/checker/Bounds.jet

-namespace boundsWithSubstitutors {
+package boundsWithSubstitutors {
     open class A<T>
     class B<X : A<X>>()
 

idea/testData/checker/ClassObjects.jet

-namespace Jet86
+package Jet86
 
 class A {
   class object {

idea/testData/checker/ExtensionFunctions.jet

@@ -37,7 +37,7 @@ val <T> T.<error>foo</error> : T
 
 fun Int.foo() = this
 
-namespace null_safety {
+package null_safety {
 
         fun parse(<warning>cmd</warning>: String): Command? { return null  }
         class Command() {

idea/testData/checker/GenericArgumentConsistency.jet

@@ -13,28 +13,28 @@ trait BB1 : BA1<Int> {}
 trait BB2 : <error>BA1<Any>, BB1</error> {}
 
 
-namespace x {
+package x {
     trait AA1<out T> {}
     trait AB1 : AA1<Int> {}
     trait AB3 : AA1<Comparable<Int>> {}
     trait AB2 : AA1<Number>, AB1, AB3 {}
 }
 
-namespace x2 {
+package x2 {
     trait AA1<out T> {}
     trait AB1 : AA1<Any> {}
     trait AB3 : AA1<Comparable<Int>> {}
     trait AB2 : <error>AA1<Number>, AB1, AB3</error> {}
 }
 
-namespace x3 {
+package x3 {
     trait AA1<in T> {}
     trait AB1 : AA1<Any> {}
     trait AB3 : AA1<Comparable<Int>> {}
     trait AB2 : AA1<Number>, AB1, AB3 {}
 }
 
-namespace sx2 {
+package sx2 {
     trait AA1<in T> {}
     trait AB1 : AA1<Int> {}
     trait AB3 : AA1<Comparable<Int>> {}

idea/testData/checker/MultipleBounds.jet

-namespace Jet87
+package Jet87
 
 open class A() {
   fun foo() : Int = 1

idea/testData/checker/NamespaceAsExpression.jet

-namespace root
+package root
 
-namespace a {
+package a {
 
 }
 
 val x = <error>a</error>
-val y2 = <error>namespace</error>
+val y2 = <error>package</error>

idea/testData/checker/NamespaceQualified.jet

-namespace foobar
+package foobar
 
-namespace a {
+package a {
     import java.*
 
     val a : util.List<Int>? = null
@@ -12,7 +12,7 @@ abstract class Foo<T>() {
     abstract val x : T<Int>
 }
 
-namespace a {
+package a {
     import java.util.*
 
     val b : List<Int>? = a

idea/testData/checker/Objects.jet

-namespace toplevelObjectDeclarations {
+package toplevelObjectDeclarations {
   open class Foo(y : Int) {
     open fun foo() : Int = 1
   }
@@ -28,7 +28,7 @@ namespace toplevelObjectDeclarations {
   val z = y.foo()
 }
 
-namespace nestedObejcts {
+package nestedObejcts {
   object A {
     val b = B
     val d = A.B.A
@@ -58,7 +58,7 @@ namespace nestedObejcts {
   val e = B.<error>A</error>.B
 }
 
-namespace localObjects {
+package localObjects {
   object A {
     val x : Int = 0
   }

idea/testData/checker/Override.jet

-namespace override
+package override
 
-namespace normal {
+package normal {
     trait MyTrait {
         fun foo()
     }
@@ -37,7 +37,7 @@ namespace normal {
     }
 }
 
-namespace generics {
+package generics {
     trait MyTrait<T> {
         fun foo(t: T) : T
     }

idea/testData/checker/QualifiedExpressions.jet

-namespace qualified_expressions
+package qualified_expressions
 
 fun test(s: String?) {
    val <warning>a</warning>: Int = <error>s?.length</error>

idea/testData/checker/QualifiedThis.jet

@@ -21,7 +21,7 @@ fun foo1() : Unit {
   this<error>@a</error>
 }
 
-namespace closures {
+package closures {
     class A(val a:Int) {
 
       class B() {

idea/testData/checker/Redeclarations.jet

-namespace redeclarations {
+package redeclarations {
   object <error>A</error> {
     val x : Int = 0
 
     val A = 1
   }
 
-  namespace <error>A</error> {
+  package <error>A</error> {
     class A {}
   }
 

idea/testData/checker/ResolveToJava.jet

@@ -47,6 +47,6 @@ fun test(<warning>l</warning> : java.util.List<Int>) {
 }
 
 
-namespace xxx {
+package xxx {
   import java.lang.Class;
 }

idea/testData/checker/Variance.jet

-namespace variance
+package variance
 
 abstract class Consumer<in T> {}
 

idea/testData/checker/regression/AmbiguityOnLazyTypeComputation.jet

 // One of the two passes is making a scope and turning vals into functions
 // See KT-76
 
-namespace x
+package x
 
 val b : Foo = Foo()
 val a1 = b.compareTo(2)

idea/testData/completion/basic/ExtendQualifiedClassName.kt

-namespace Test.SubTest.AnotherTest
+package Test.SubTest.AnotherTest
 
 open class TestClass {
 }

idea/testData/completion/basic/FromImports.kt

-namespace Tests
+package Tests
 
 import java.util.*
 

idea/testData/completion/basic/JavaPackage.kt

-namespace Tests
+package Tests
 
 class A : java.<caret>
 

idea/testData/completion/basic/OverloadFunctions.kt

-namespace Test.MyTest
+package Test.MyTest
 
 class A {
     class object {

idea/testData/completion/basic/SubpackageInFun.kt

-namespace Test.MyTest
+package Test.MyTest
 
 fun test() {
     Test.<caret>

idea/testData/completion/basic/extensions/ExtensionInExtendedClass.kt

-namespace Test
+package Test
 
 class Some() {
     fun methodName() {

idea/testData/completion/handlers/SingleBrackets.kt

-namespace Test.MyTest
+package Test.MyTest
 
 class A {
     class object {

idea/testData/completion/handlers/SingleBrackets.kt.after

-namespace Test.MyTest
+package Test.MyTest
 
 class A {
     class object {

idea/testData/quickfix/abstract/afterNonMemberFunctionNoBody.kt

 // "Add function body" "true"
-namespace a {
+package a {
 fun <caret>foo() {
 }
 }
\ No newline at end of file

idea/testData/quickfix/abstract/beforeNonMemberFunctionNoBody.kt

 // "Add function body" "true"
-namespace a {
+package a {
 fun <caret>foo()
 }
\ No newline at end of file

idea/testData/quickfix/addPrimaryConstructor/afterAddPrimaryConstructor1.kt

 // "Add primary constructor to A" "true"
-namespace a
+package a
 
 class A() {
     var i : Int = <caret>1

idea/testData/quickfix/addPrimaryConstructor/afterAddPrimaryConstructor2.kt

 // "Add primary constructor to A" "true"
-namespace a
+package a
 
 class A<caret>() {
     var i : Int = 1

idea/testData/quickfix/addPrimaryConstructor/beforeAddPrimaryConstructor1.kt

 // "Add primary constructor to A" "true"
-namespace a
+package a
 
 class A {
     var i : Int = <caret>1

idea/testData/quickfix/addPrimaryConstructor/beforeAddPrimaryConstructor2.kt

 // "Add primary constructor to A" "true"
-namespace a
+package a
 
 class A<caret> {
     var i : Int = 1

idea/testData/quickfix/autoImports/afterImportSingleFile.kt

 // "Import Class" "true"
-namespace a
+package a
 
 import a.b.M
 
@@ -7,6 +7,6 @@ fun test() {
     val v = M
 }
 
-namespace b {
+package b {
     class M() { }
 }
\ No newline at end of file

idea/testData/quickfix/autoImports/beforeImportSingleFile.kt

 // "Import Class" "true"
-namespace a
+package a
 
 fun test() {
     val v = <caret>M
 }
 
-namespace b {
+package b {
     class M() { }
 }
\ No newline at end of file

idea/testData/quickfix/autoImports/beforeKotlinImport.Data.Sample.kt

-namespace TestData
+package TestData
 
 class TestSample() {}
\ No newline at end of file

idea/testData/quickfix/classImport/afterHasThisImport.kt

 // "Remove initializer from property" "true"
-namespace a
+package a
 
 import java.util.Collections
 
-namespace b {
+package b {
 
 import java.util.List
 

idea/testData/quickfix/classImport/afterNoImportJavaLang.kt

 // "Remove initializer from property" "true"
-namespace a
+package a
 
 class M {
     trait A {

idea/testData/quickfix/classImport/afterNoImportJetStandard.kt

 // "Remove initializer from property" "true"
-namespace a
+package a
 
 class M {
     trait A {

idea/testData/quickfix/classImport/afterToImport1.kt

 // "Remove initializer from property" "true"
-namespace a
+package a
 
 import java.util.Collections
 import java.util.List

idea/testData/quickfix/classImport/afterToImport2.kt

 // "Remove initializer from property" "true"
-namespace a
+package a
 
 import java.util.Collections
 
-namespace b {
+package b {
 
 import java.util.List
 

idea/testData/quickfix/classImport/beforeHasThisImport.kt

 // "Remove initializer from property" "true"
-namespace a
+package a
 
 import java.util.Collections
 
-namespace b {
+package b {
 
 import java.util.List
 

idea/testData/quickfix/classImport/beforeNoImportJavaLang.kt

 // "Remove initializer from property" "true"
-namespace a
+package a
 
 class M {
     trait A {

idea/testData/quickfix/classImport/beforeNoImportJetStandard.kt

 // "Remove initializer from property" "true"
-namespace a
+package a
 
 class M {
     trait A {

idea/testData/quickfix/classImport/beforeToImport1.kt

 // "Remove initializer from property" "true"
-namespace a
+package a
 
 import java.util.Collections
 

idea/testData/quickfix/classImport/beforeToImport2.kt

 // "Remove initializer from property" "true"
-namespace a
+package a
 
 import java.util.Collections
 
-namespace b {
+package b {
 
 class M {
     trait A {

idea/testData/quickfix/typeAddition/afterProtectedFunWithoutReturnType.kt

 // "Add return type declaration" "true"
-namespace a
+package a
 
 class A() {
     protected fun <caret>foo() : Int = 1

idea/testData/quickfix/typeAddition/afterPublicFunWithoutReturnType.kt

 // "Add return type declaration" "true"
-namespace a
+package a
 
 class A() {
     public fun <caret>foo() : String = "a"

idea/testData/quickfix/typeAddition/afterPublicValWithoutReturnType.kt

 // "Add return type declaration" "true"
-namespace a
+package a
 
 import java.util.List
 

idea/testData/quickfix/typeAddition/beforeInternalProtectedFunWithoutReturnType.kt

 // "Add return type declaration" "false"
-namespace a
+package a
 
 class A() {
     internal protected fun <caret>foo() = 1

idea/testData/quickfix/typeAddition/beforeProtectedFunWithoutReturnType.kt

 // "Add return type declaration" "true"
-namespace a
+package a
 
 class A() {
     protected fun <caret>foo() = 1

idea/testData/quickfix/typeAddition/beforePublicFunWithoutBody.kt

 // "Add return type declaration" "false"
-namespace a
+package a
 
 class A() {
     public fun <caret>foo()

idea/testData/quickfix/typeAddition/beforePublicFunWithoutReturnType.kt

 // "Add return type declaration" "true"
-namespace a
+package a
 
 class A() {
     public fun <caret>foo() = "a"

idea/testData/quickfix/typeAddition/beforePublicValWithoutReturnType.kt

 // "Add return type declaration" "true"
-namespace a
+package a
 
 public val <caret>l = java.util.Collections.emptyList<Int>()
\ No newline at end of file

stdlib/ktSrc/Standard.kt

-namespace std
+package std
 
 import java.util.Collection
 import java.util.ArrayList

templatelib/src/TemplateCore.kt

-namespace std.template
+package std.template
 
 import std.io.*
 

templatelib/src/TemplateHtml.kt

-namespace std.template.html
+package std.template.html
 
 import std.*
 import std.template.*

templatelib/src/TemplateJavaIo.kt

 // Server side Java IO code to avoid coupling
 // the core template code to java.* for easier JS porting
-namespace std.template.io
+package std.template.io
 
 import std.template.*
 import java.io.Writer

templatelib/test/TemplateCoreTest.kt

-namespace std.template
+package std.template
 
 import std.*
 import std.template.io.*

templatelib/test/TemplateHtmlTest.kt

-namespace std.template.html
+package std.template.html
 
 import std.*
 import std.template.*

testlib/src/Test.kt

-namespace std.test
+package std.test
 
 import std.io.*
 import std.util.*

testlib/test/CollectionApiCheck.kt

-namespace test.apicheck
+package test.apicheck
 
 import std.util.*
 import java.util.*

testlib/test/CollectionTest.kt

-namespace test.collections
+package test.collections
 
 // TODO can we avoid importing all this stuff by default I wonder?
 // e.g. making println and the collection builder methods public by default?

testlib/test/GenerateStandardLib.kt

-namespace kotlin.tools
+package kotlin.tools
 
 import std.*
 import std.io.*

testlib/test/IoTest.kt

-namespace test.collections
+package test.collections
 
 import std.test.*
 

testlib/test/ListTest.kt

-namespace test.collections
+package test.collections
 
 import std.test.*
 

testlib/test/MapTest.kt

-namespace test.collections
+package test.collections
 
 import std.test.*
 

testlib/test/SetTest.kt

-namespace test.collections
+package test.collections
 
 import std.*
 import std.io.*

testlib/test/TestDslExample.kt

-namespace testDslExample
+package testDslExample
 
 import std.io.*
 import std.test.*