[Jython-checkins] CVS: jython/org/python/parser PythonGrammar.java,2.15,2.16 PythonGrammarConstants.java,2.7,2.8 PythonGrammarTokenManager.java,2.14,2.15 PythonGrammarTreeConstants.java,2.7,2.8

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/parser
In directory usw-pr-cvs1:/tmp/cvs-serv20545

Modified Files:
	PythonGrammar.java PythonGrammarConstants.java 
	PythonGrammarTokenManager.java PythonGrammarTreeConstants.java 
Log Message:
Generated files (floor division operator).



Index: PythonGrammar.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammar.java,v
retrieving revision 2.15
retrieving revision 2.16
diff -C2 -d -r2.15 -r2.16
*** PythonGrammar.java	2001/12/20 17:19:03	2.15
--- PythonGrammar.java	2002/01/13 18:26:51	2.16
***************
*** 55,59 ****
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 113:
          simple_stmt();
          break;
--- 55,59 ----
        case TRIPLE_STRING:
        case TRIPLE_STRING2:
!       case 115:
          simple_stmt();
[...1432 lines suppressed...]
--- 6816,6821 ----
    final public ParseException generateParseException() {
      jj_expentries.removeAllElements();
!     boolean[] la1tokens = new boolean[116];
!     for (int i = 0; i < 116; i++) {
        la1tokens[i] = false;
      }
***************
*** 6783,6787 ****
        }
      }
!     for (int i = 0; i < 114; i++) {
        if (la1tokens[i]) {
          jj_expentry = new int[1];
--- 6842,6846 ----
        }
      }
!     for (int i = 0; i < 116; i++) {
        if (la1tokens[i]) {
          jj_expentry = new int[1];

Index: PythonGrammarConstants.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarConstants.java,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -d -r2.7 -r2.8
*** PythonGrammarConstants.java	2001/10/30 20:37:33	2.7
--- PythonGrammarConstants.java	2002/01/13 18:26:51	2.8
***************
*** 30,101 ****
    int MULTIPLY = 30;
    int DIVIDE = 31;
!   int POWER = 32;
!   int LSHIFT = 33;
!   int RSHIFT = 34;
!   int MODULO = 35;
!   int NOT = 36;
!   int XOR = 37;
!   int OR = 38;
!   int AND = 39;
!   int EQUAL = 40;
!   int GREATER = 41;
!   int LESS = 42;
!   int EQEQUAL = 43;
!   int EQLESS = 44;
!   int EQGREATER = 45;
!   int LESSGREATER = 46;
!   int NOTEQUAL = 47;
!   int PLUSEQ = 48;
!   int MINUSEQ = 49;
!   int MULTIPLYEQ = 50;
!   int DIVIDEEQ = 51;
!   int MODULOEQ = 52;
!   int ANDEQ = 53;
!   int OREQ = 54;
!   int XOREQ = 55;
!   int LSHIFTEQ = 56;
!   int RSHIFTEQ = 57;
!   int POWEREQ = 58;
!   int OR_BOOL = 59;
!   int AND_BOOL = 60;
!   int NOT_BOOL = 61;
!   int IS = 62;
!   int IN = 63;
!   int LAMBDA = 64;
!   int IF = 65;
!   int ELSE = 66;
!   int ELIF = 67;
!   int WHILE = 68;
!   int FOR = 69;
!   int TRY = 70;
!   int EXCEPT = 71;
!   int DEF = 72;
!   int CLASS = 73;
!   int FINALLY = 74;
!   int PRINT = 75;
!   int PASS = 76;
!   int BREAK = 77;
!   int CONTINUE = 78;
!   int RETURN = 79;
!   int IMPORT = 80;
!   int FROM = 81;
!   int DEL = 82;
!   int RAISE = 83;
!   int GLOBAL = 84;
!   int EXEC = 85;
!   int ASSERT = 86;
!   int AS = 87;
!   int NAME = 88;
!   int LETTER = 89;
!   int DECNUMBER = 90;
!   int HEXNUMBER = 91;
!   int OCTNUMBER = 92;
!   int FLOAT = 93;
!   int EXPONENT = 94;
!   int DIGIT = 95;
!   int SINGLE_STRING = 100;
!   int SINGLE_STRING2 = 101;
!   int TRIPLE_STRING = 102;
!   int TRIPLE_STRING2 = 103;
  
    int DEFAULT = 0;
--- 30,103 ----
    int MULTIPLY = 30;
    int DIVIDE = 31;
!   int FLOORDIVIDE = 32;
!   int POWER = 33;
!   int LSHIFT = 34;
!   int RSHIFT = 35;
!   int MODULO = 36;
!   int NOT = 37;
!   int XOR = 38;
!   int OR = 39;
!   int AND = 40;
!   int EQUAL = 41;
!   int GREATER = 42;
!   int LESS = 43;
!   int EQEQUAL = 44;
!   int EQLESS = 45;
!   int EQGREATER = 46;
!   int LESSGREATER = 47;
!   int NOTEQUAL = 48;
!   int PLUSEQ = 49;
!   int MINUSEQ = 50;
!   int MULTIPLYEQ = 51;
!   int DIVIDEEQ = 52;
!   int FLOORDIVIDEEQ = 53;
!   int MODULOEQ = 54;
!   int ANDEQ = 55;
!   int OREQ = 56;
!   int XOREQ = 57;
!   int LSHIFTEQ = 58;
!   int RSHIFTEQ = 59;
!   int POWEREQ = 60;
!   int OR_BOOL = 61;
!   int AND_BOOL = 62;
!   int NOT_BOOL = 63;
!   int IS = 64;
!   int IN = 65;
!   int LAMBDA = 66;
!   int IF = 67;
!   int ELSE = 68;
!   int ELIF = 69;
!   int WHILE = 70;
!   int FOR = 71;
!   int TRY = 72;
!   int EXCEPT = 73;
!   int DEF = 74;
!   int CLASS = 75;
!   int FINALLY = 76;
!   int PRINT = 77;
!   int PASS = 78;
!   int BREAK = 79;
!   int CONTINUE = 80;
!   int RETURN = 81;
!   int IMPORT = 82;
!   int FROM = 83;
!   int DEL = 84;
!   int RAISE = 85;
!   int GLOBAL = 86;
!   int EXEC = 87;
!   int ASSERT = 88;
!   int AS = 89;
!   int NAME = 90;
!   int LETTER = 91;
!   int DECNUMBER = 92;
!   int HEXNUMBER = 93;
!   int OCTNUMBER = 94;
!   int FLOAT = 95;
!   int EXPONENT = 96;
!   int DIGIT = 97;
!   int SINGLE_STRING = 102;
!   int SINGLE_STRING2 = 103;
!   int TRIPLE_STRING = 104;
!   int TRIPLE_STRING2 = 105;
  
    int DEFAULT = 0;
***************
*** 144,147 ****
--- 146,150 ----
      "\"*\"",
      "\"/\"",
+     "\"//\"",
      "\"**\"",
      "\"<<\"",
***************
*** 164,167 ****
--- 167,171 ----
      "\"*=\"",
      "\"/=\"",
+     "\"//=\"",
      "\"%=\"",
      "\"&=\"",
***************
*** 208,215 ****
      "<EXPONENT>",
      "<DIGIT>",
-     "<token of kind 96>",
-     "<token of kind 97>",
      "<token of kind 98>",
      "<token of kind 99>",
      "\"\\\'\"",
      "\"\\\"\"",
--- 212,219 ----
      "<EXPONENT>",
      "<DIGIT>",
      "<token of kind 98>",
      "<token of kind 99>",
+     "<token of kind 100>",
+     "<token of kind 101>",
      "\"\\\'\"",
      "\"\\\"\"",
***************
*** 217,228 ****
      "\"\\\"\\\"\\\"\"",
      "\"\\\\\\r\\n\"",
-     "<token of kind 105>",
-     "<token of kind 106>",
      "<token of kind 107>",
      "\"\\r\\n\"",
      "\"\\n\"",
      "\"\\r\"",
!     "<token of kind 111>",
!     "<token of kind 112>",
      "\"`\"",
    };
--- 221,232 ----
      "\"\\\"\\\"\\\"\"",
      "\"\\\\\\r\\n\"",
      "<token of kind 107>",
+     "<token of kind 108>",
+     "<token of kind 109>",
      "\"\\r\\n\"",
      "\"\\n\"",
      "\"\\r\"",
!     "<token of kind 113>",
!     "<token of kind 114>",
      "\"`\"",
    };

Index: PythonGrammarTokenManager.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarTokenManager.java,v
retrieving revision 2.14
retrieving revision 2.15
diff -C2 -d -r2.14 -r2.15
*** PythonGrammarTokenManager.java	2001/12/20 17:19:06	2.14
--- PythonGrammarTokenManager.java	2002/01/13 18:26:51	2.15
***************
*** 52,67 ****
     {
        case 0:
!          if ((active1 & 0x8000000000L) != 0L)
           {
!             jjmatchedKind = 111;
              return -1;
           }
           return -1;
        case 1:
!          if ((active1 & 0x8000000000L) != 0L)
[...2095 lines suppressed...]
              image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
--- 2937,2941 ----
      matchedToken.image = image.toString();
           break;
!       case 104 :
          if (image == null)
              image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
***************
*** 2934,2938 ****
      matchedToken.image = image.toString();
           break;
!       case 103 :
          if (image == null)
              image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));
--- 2944,2948 ----
      matchedToken.image = image.toString();
           break;
!       case 105 :
          if (image == null)
              image = new StringBuffer(new String(input_stream.GetSuffix(jjimageLen + (lengthOfMatch = jjmatchedPos + 1))));

Index: PythonGrammarTreeConstants.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/parser/PythonGrammarTreeConstants.java,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -d -r2.7 -r2.8
*** PythonGrammarTreeConstants.java	2002/01/06 21:19:14	2.7
--- PythonGrammarTreeConstants.java	2002/01/13 18:26:51	2.8
***************
*** 20,104 ****
    public int JJTAUG_MULTIPLY = 13;
    public int JJTAUG_DIVIDE = 14;
!   public int JJTAUG_MODULO = 15;
!   public int JJTAUG_AND = 16;
!   public int JJTAUG_OR = 17;
!   public int JJTAUG_XOR = 18;
!   public int JJTAUG_LSHIFT = 19;
!   public int JJTAUG_RSHIFT = 20;
!   public int JJTAUG_POWER = 21;
!   public int JJTPRINT_STMT = 22;
!   public int JJTPRINT_EXT = 23;
!   public int JJTDEL_STMT = 24;
!   public int JJTPASS_STMT = 25;
!   public int JJTBREAK_STMT = 26;
!   public int JJTCONTINUE_STMT = 27;
!   public int JJTRETURN_STMT = 28;
!   public int JJTRAISE_STMT = 29;
!   public int JJTIMPORT = 30;
!   public int JJTIMPORTFROM = 31;
!   public int JJTDOTTED_AS_NAME = 32;
!   public int JJTDOTTED_NAME = 33;
!   public int JJTIMPORT_AS_NAME = 34;
!   public int JJTGLOBAL_STMT = 35;
!   public int JJTEXEC_STMT = 36;
!   public int JJTASSERT_STMT = 37;
!   public int JJTIF_STMT = 38;
!   public int JJTWHILE_STMT = 39;
!   public int JJTFOR_STMT = 40;
!   public int JJTTRY_STMT = 41;
!   public int JJTEXCEPT_CLAUSE = 42;
!   public int JJTSUITE = 43;
!   public int JJTOR_BOOLEAN = 44;
!   public int JJTAND_BOOLEAN = 45;
!   public int JJTNOT_1OP = 46;
!   public int JJTCOMPARISION = 47;
!   public int JJTLESS_CMP = 48;
!   public int JJTGREATER_CMP = 49;
!   public int JJTEQUAL_CMP = 50;
!   public int JJTGREATER_EQUAL_CMP = 51;
!   public int JJTLESS_EQUAL_CMP = 52;
!   public int JJTNOTEQUAL_CMP = 53;
!   public int JJTIN_CMP = 54;
!   public int JJTNOT_IN_CMP = 55;
!   public int JJTIS_NOT_CMP = 56;
!   public int JJTIS_CMP = 57;
!   public int JJTOR_2OP = 58;
!   public int JJTXOR_2OP = 59;
!   public int JJTAND_2OP = 60;
!   public int JJTLSHIFT_2OP = 61;
!   public int JJTRSHIFT_2OP = 62;
!   public int JJTADD_2OP = 63;
!   public int JJTSUB_2OP = 64;
!   public int JJTMUL_2OP = 65;
!   public int JJTDIV_2OP = 66;
!   public int JJTMOD_2OP = 67;
!   public int JJTPOS_1OP = 68;
!   public int JJTNEG_1OP = 69;
!   public int JJTINVERT_1OP = 70;
!   public int JJTPOW_2OP = 71;
!   public int JJTCALL_OP = 72;
!   public int JJTINDEX_OP = 73;
!   public int JJTDOT_OP = 74;
!   public int JJTTUPLE = 75;
!   public int JJTLIST = 76;
!   public int JJTDICTIONARY = 77;
!   public int JJTSTR_1OP = 78;
!   public int JJTSTRJOIN = 79;
!   public int JJTLAMBDEF = 80;
!   public int JJTELLIPSES = 81;
!   public int JJTSLICE = 82;
!   public int JJTCOLON = 83;
!   public int JJTCOMMA = 84;
!   public int JJTLIST_ITER = 85;
!   public int JJTCLASSDEF = 86;
!   public int JJTARGLIST = 87;
!   public int JJTEXTRAARGVALUELIST = 88;
!   public int JJTEXTRAKEYWORDVALUELIST = 89;
!   public int JJTKEYWORD = 90;
!   public int JJTINT = 91;
!   public int JJTFLOAT = 92;
!   public int JJTCOMPLEX = 93;
!   public int JJTNAME = 94;
!   public int JJTSTRING = 95;
  
  
--- 20,106 ----
    public int JJTAUG_MULTIPLY = 13;
    public int JJTAUG_DIVIDE = 14;
!   public int JJTAUG_FLOORDIVIDE = 15;
!   public int JJTAUG_MODULO = 16;
!   public int JJTAUG_AND = 17;
!   public int JJTAUG_OR = 18;
!   public int JJTAUG_XOR = 19;
!   public int JJTAUG_LSHIFT = 20;
!   public int JJTAUG_RSHIFT = 21;
!   public int JJTAUG_POWER = 22;
!   public int JJTPRINT_STMT = 23;
!   public int JJTPRINT_EXT = 24;
!   public int JJTDEL_STMT = 25;
!   public int JJTPASS_STMT = 26;
!   public int JJTBREAK_STMT = 27;
!   public int JJTCONTINUE_STMT = 28;
!   public int JJTRETURN_STMT = 29;
!   public int JJTRAISE_STMT = 30;
!   public int JJTIMPORT = 31;
!   public int JJTIMPORTFROM = 32;
!   public int JJTDOTTED_AS_NAME = 33;
!   public int JJTDOTTED_NAME = 34;
!   public int JJTIMPORT_AS_NAME = 35;
!   public int JJTGLOBAL_STMT = 36;
!   public int JJTEXEC_STMT = 37;
!   public int JJTASSERT_STMT = 38;
!   public int JJTIF_STMT = 39;
!   public int JJTWHILE_STMT = 40;
!   public int JJTFOR_STMT = 41;
!   public int JJTTRY_STMT = 42;
!   public int JJTEXCEPT_CLAUSE = 43;
!   public int JJTSUITE = 44;
!   public int JJTOR_BOOLEAN = 45;
!   public int JJTAND_BOOLEAN = 46;
!   public int JJTNOT_1OP = 47;
!   public int JJTCOMPARISION = 48;
!   public int JJTLESS_CMP = 49;
!   public int JJTGREATER_CMP = 50;
!   public int JJTEQUAL_CMP = 51;
!   public int JJTGREATER_EQUAL_CMP = 52;
!   public int JJTLESS_EQUAL_CMP = 53;
!   public int JJTNOTEQUAL_CMP = 54;
!   public int JJTIN_CMP = 55;
!   public int JJTNOT_IN_CMP = 56;
!   public int JJTIS_NOT_CMP = 57;
!   public int JJTIS_CMP = 58;
!   public int JJTOR_2OP = 59;
!   public int JJTXOR_2OP = 60;
!   public int JJTAND_2OP = 61;
!   public int JJTLSHIFT_2OP = 62;
!   public int JJTRSHIFT_2OP = 63;
!   public int JJTADD_2OP = 64;
!   public int JJTSUB_2OP = 65;
!   public int JJTMUL_2OP = 66;
!   public int JJTDIV_2OP = 67;
!   public int JJTFLOORDIV_2OP = 68;
!   public int JJTMOD_2OP = 69;
!   public int JJTPOS_1OP = 70;
!   public int JJTNEG_1OP = 71;
!   public int JJTINVERT_1OP = 72;
!   public int JJTPOW_2OP = 73;
!   public int JJTCALL_OP = 74;
!   public int JJTINDEX_OP = 75;
!   public int JJTDOT_OP = 76;
!   public int JJTTUPLE = 77;
!   public int JJTLIST = 78;
!   public int JJTDICTIONARY = 79;
!   public int JJTSTR_1OP = 80;
!   public int JJTSTRJOIN = 81;
!   public int JJTLAMBDEF = 82;
!   public int JJTELLIPSES = 83;
!   public int JJTSLICE = 84;
!   public int JJTCOLON = 85;
!   public int JJTCOMMA = 86;
!   public int JJTLIST_ITER = 87;
!   public int JJTCLASSDEF = 88;
!   public int JJTARGLIST = 89;
!   public int JJTEXTRAARGVALUELIST = 90;
!   public int JJTEXTRAKEYWORDVALUELIST = 91;
!   public int JJTKEYWORD = 92;
!   public int JJTINT = 93;
!   public int JJTFLOAT = 94;
!   public int JJTCOMPLEX = 95;
!   public int JJTNAME = 96;
!   public int JJTSTRING = 97;
  
  
***************
*** 119,122 ****
--- 121,125 ----
      "aug_multiply",
      "aug_divide",
+     "aug_floordivide",
      "aug_modulo",
      "aug_and",
***************
*** 171,174 ****
--- 174,178 ----
      "mul_2op",
      "div_2op",
+     "floordiv_2op",
      "mod_2op",
      "pos_1op",