svn commit: r386056 [1/28] - in /jakarta/bcel/trunk: examples/ examples/Mini/ src/java/org/apache/bcel/ src/java/org/apache/bcel/classfile/ src/java/org/apache/bcel/generic/ src/java/org/apache/bcel/util/ src/java/org/apache/bcel/verifier/ src/java/org...
[email protected] Wed, 15 Mar 2006 11:33:43 -0000
Newsgroups
gmane.comp.jakarta.bcel.devel
Message-ID
<[email protected] >
Author: tcurdt
Date: Wed Mar 15 03:31:56 2006
New Revision: 386056
URL: http://svn.apache.org/viewcvs?rev=386056&view=rev
Log:
code formatting and cleanups
Modified:
jakarta/bcel/trunk/examples/JasminVisitor.java
jakarta/bcel/trunk/examples/Mini/ASCII_CharStream.java
jakarta/bcel/trunk/examples/Mini/ASTExpr.java
jakarta/bcel/trunk/examples/Mini/ASTFactor.java
jakarta/bcel/trunk/examples/Mini/ASTFunAppl.java
jakarta/bcel/trunk/examples/Mini/ASTFunDecl.java
jakarta/bcel/trunk/examples/Mini/ASTIdent.java
jakarta/bcel/trunk/examples/Mini/ASTIfExpr.java
jakarta/bcel/trunk/examples/Mini/ASTLetExpr.java
jakarta/bcel/trunk/examples/Mini/ASTProgram.java
jakarta/bcel/trunk/examples/Mini/ASTTerm.java
jakarta/bcel/trunk/examples/Mini/Environment.java
jakarta/bcel/trunk/examples/Mini/Function.java
jakarta/bcel/trunk/examples/Mini/MiniC.java
jakarta/bcel/trunk/examples/Mini/MiniParser.java
jakarta/bcel/trunk/examples/Mini/MiniParserTokenManager.java
jakarta/bcel/trunk/examples/Mini/ParseException.java
jakarta/bcel/trunk/examples/Mini/Variable.java
jakarta/bcel/trunk/examples/Peephole.java
jakarta/bcel/trunk/examples/ProxyCreator.java
jakarta/bcel/trunk/examples/helloify.java
jakarta/bcel/trunk/examples/id.java
jakarta/bcel/trunk/examples/listclass.java
jakarta/bcel/trunk/examples/maxstack.java
jakarta/bcel/trunk/examples/patchclass.java
jakarta/bcel/trunk/src/java/org/apache/bcel/ExceptionConstants.java
jakarta/bcel/trunk/src/java/org/apache/bcel/Repository.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/AccessFlags.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/AnnotationDefault.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/AnnotationEntry.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Annotations.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Attribute.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/AttributeReader.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ClassFormatException.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ClassParser.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Code.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/CodeException.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Constant.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantCP.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantClass.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantDouble.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantFieldref.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantFloat.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantInteger.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantInterfaceMethodref.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantLong.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantMethodref.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantNameAndType.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantObject.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantPool.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantString.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantUtf8.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ConstantValue.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Deprecated.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/DescendingVisitor.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ElementValue.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ElementValuePair.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/EmptyVisitor.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ExceptionTable.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Field.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/FieldOrMethod.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/InnerClass.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/InnerClasses.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/JavaClass.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/LineNumber.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/LineNumberTable.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/LocalVariable.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/LocalVariableTable.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Method.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Node.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/PMGClass.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ParameterAnnotationEntry.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/ParameterAnnotations.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/RuntimeInvisibleAnnotations.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/RuntimeInvisibleParameterAnnotations.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/RuntimeVisibleAnnotations.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/RuntimeVisibleParameterAnnotations.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Signature.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/SourceFile.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMap.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapEntry.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/StackMapType.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Synthetic.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Unknown.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Utility.java
jakarta/bcel/trunk/src/java/org/apache/bcel/classfile/Visitor.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/AALOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/AASTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ACONST_NULL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ALOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ANEWARRAY.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ARETURN.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ARRAYLENGTH.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ASTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ATHROW.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/AllocationInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ArithmeticInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ArrayInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ArrayType.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BALOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BASTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BIPUSH.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BREAKPOINT.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BasicType.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BranchHandle.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/BranchInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/CALOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/CASTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/CHECKCAST.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/CPInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ClassGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ClassGenException.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ClassObserver.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/CodeExceptionGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/CompoundInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ConstantPoolGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ConstantPushInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ConversionInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/D2F.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/D2I.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/D2L.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DADD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DALOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DASTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DCMPG.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DCMPL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DCONST.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DDIV.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DLOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DMUL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DNEG.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DREM.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DRETURN.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DSTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DSUB.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DUP.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DUP2.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DUP2_X1.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DUP2_X2.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DUP_X1.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/DUP_X2.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/EmptyVisitor.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ExceptionThrower.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/F2D.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/F2I.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/F2L.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FADD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FALOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FASTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FCMPG.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FCMPL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FCONST.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FDIV.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FLOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FMUL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FNEG.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FREM.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FRETURN.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FSTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FSUB.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FieldGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FieldGenOrMethodGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FieldInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FieldObserver.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/FieldOrMethod.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/GETFIELD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/GETSTATIC.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/GOTO.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/GOTO_W.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/GotoInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/I2B.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/I2C.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/I2D.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/I2F.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/I2L.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/I2S.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IADD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IALOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IAND.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IASTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ICONST.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IDIV.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IFEQ.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IFGE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IFGT.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IFLE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IFLT.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IFNE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IFNONNULL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IFNULL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IF_ACMPEQ.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IF_ACMPNE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IF_ICMPEQ.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IF_ICMPGE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IF_ICMPGT.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IF_ICMPLE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IF_ICMPLT.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IF_ICMPNE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IINC.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ILOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IMPDEP1.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IMPDEP2.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IMUL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/INEG.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/INSTANCEOF.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/INVOKEINTERFACE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/INVOKESPECIAL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/INVOKESTATIC.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/INVOKEVIRTUAL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IOR.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IREM.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IRETURN.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ISHL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ISHR.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ISTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ISUB.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IUSHR.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IXOR.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IfInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/IndexedInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Instruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionComparator.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionConstants.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionFactory.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionHandle.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionList.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionListObserver.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InstructionTargeter.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/InvokeInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/JSR.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/JSR_W.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/JsrInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/L2D.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/L2F.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/L2I.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LADD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LALOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LAND.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LASTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LCMP.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LCONST.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LDC.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LDC2_W.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LDC_W.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LDIV.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LLOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LMUL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LNEG.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LOOKUPSWITCH.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LOR.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LREM.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LRETURN.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LSHL.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LSHR.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LSTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LSUB.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LUSHR.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LXOR.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LineNumberGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LoadClass.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LoadInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LocalVariableGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/LocalVariableInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/MONITORENTER.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/MONITOREXIT.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/MULTIANEWARRAY.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/MethodGen.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/MethodObserver.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/NEW.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/NEWARRAY.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/NOP.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/NamedAndTyped.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ObjectType.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/POP.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/POP2.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/PUSH.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/PUTFIELD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/PUTSTATIC.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/PopInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/PushInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/RET.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/RETURN.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ReferenceType.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ReturnInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/ReturnaddressType.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/SALOAD.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/SASTORE.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/SIPUSH.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/SWAP.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/SWITCH.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Select.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/StackConsumer.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/StackInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/StackProducer.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/StoreInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/TABLESWITCH.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/TargetLostException.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Type.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/TypedInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/UnconditionalBranch.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/VariableLengthInstruction.java
jakarta/bcel/trunk/src/java/org/apache/bcel/generic/Visitor.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/AttributeHTML.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELComparator.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELFactory.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/BCELifier.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/ByteSequence.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/Class2HTML.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassLoader.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassLoaderRepository.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassPath.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassQueue.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassSet.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassStack.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/ClassVector.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/CodeHTML.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/ConstantHTML.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/InstructionFinder.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/JavaWrapper.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/MethodHTML.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/Repository.java
jakarta/bcel/trunk/src/java/org/apache/bcel/util/SyntheticRepository.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/GraphicalVerifier.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/NativeVerifier.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/PassVerifier.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/TransitiveHull.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/VerificationResult.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/Verifier.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/VerifierAppFrame.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/VerifierFactory.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/VerifierFactoryListModel.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/VerifierFactoryObserver.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/VerifyDialog.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/exc/AssertionViolatedException.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/IntList.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/statics/StringRepresentation.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ExceptionHandlers.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/ExecutionVisitor.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Frame.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/LocalVariables.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/OperandStack.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/Subroutines.java
jakarta/bcel/trunk/src/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java
Modified: jakarta/bcel/trunk/examples/JasminVisitor.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/JasminVisitor.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/JasminVisitor.java (original)
+++ jakarta/bcel/trunk/examples/JasminVisitor.java Wed Mar 15 03:31:56 2006
@@ -73,8 +73,9 @@
String[] interfaces = clazz.getInterfaceNames();
- for(int i=0; i < interfaces.length; i++)
- out.println(".implements " + interfaces[i].replace('.', '/'));
+ for(int i=0; i < interfaces.length; i++) {
+ out.println(".implements " + interfaces[i].replace('.', '/'));
+ }
out.print("\n");
}
@@ -82,8 +83,9 @@
public void visitField(Field field) {
out.print(".field " + Utility.accessToString(field.getAccessFlags()) +
" \"" +field.getName() + "\"" + field.getSignature());
- if(field.getAttributes().length == 0)
- out.print("\n");
+ if(field.getAttributes().length == 0) {
+ out.print("\n");
+ }
}
public void visitConstantValue(ConstantValue cv) {
@@ -100,15 +102,17 @@
private final void printEndMethod(Attribute attr) {
Attribute[] attributes = _method.getAttributes();
- if(attr == attributes[attributes.length - 1])
- out.println(".end method");
+ if(attr == attributes[attributes.length - 1]) {
+ out.println(".end method");
+ }
}
public void visitDeprecated(Deprecated attribute) { printEndMethod(attribute); }
public void visitSynthetic(Synthetic attribute) {
- if(_method != null)
- printEndMethod(attribute);
+ if(_method != null) {
+ printEndMethod(attribute);
+ }
}
public void visitMethod(Method method) {
@@ -118,14 +122,16 @@
" " + _method.getName() + _method.getSignature());
Attribute[] attributes = _method.getAttributes();
- if((attributes == null) || (attributes.length == 0))
- out.println(".end method");
+ if((attributes == null) || (attributes.length == 0)) {
+ out.println(".end method");
+ }
}
public void visitExceptionTable(ExceptionTable e) {
String[] names = e.getExceptionNames();
- for(int i=0; i < names.length; i++)
- out.println(".throws " + names[i].replace('.', '/'));
+ for(int i=0; i < names.length; i++) {
+ out.println(".throws " + names[i].replace('.', '/'));
+ }
printEndMethod(e);
}
@@ -154,8 +160,9 @@
if(bi instanceof Select) { // Special cases LOOKUPSWITCH and TABLESWITCH
InstructionHandle[] targets = ((Select)bi).getTargets();
- for(int j=0; j < targets.length; j++)
- put(targets[j], "Label" + label_counter++ + ":");
+ for(int j=0; j < targets.length; j++) {
+ put(targets[j], "Label" + label_counter++ + ":");
+ }
}
InstructionHandle ih = bi.getTarget();
@@ -206,8 +213,9 @@
Instruction inst = ih.getInstruction();
String str = (String)map.get(ih);
- if(str != null)
- out.println(str);
+ if(str != null) {
+ out.println(str);
+ }
if(inst instanceof BranchInstruction) {
if(inst instanceof Select) { // Special cases LOOKUPSWITCH and TABLESWITCH
@@ -219,14 +227,16 @@
out.println("\ttableswitch " + matchs[0] + " " +
matchs[matchs.length - 1]);
- for(int j=0; j < targets.length; j++)
- out.println("\t\t" + get(targets[j]));
+ for(int j=0; j < targets.length; j++) {
+ out.println("\t\t" + get(targets[j]));
+ }
} else { // LOOKUPSWITCH
out.println("\tlookupswitch ");
- for(int j=0; j < targets.length; j++)
- out.println("\t\t" + matchs[j] + " : " + get(targets[j]));
+ for(int j=0; j < targets.length; j++) {
+ out.println("\t\t" + matchs[j] + " : " + get(targets[j]));
+ }
}
out.println("\t\tdefault: " + get(s.getTarget())); // Applies for both
@@ -236,9 +246,9 @@
str = get(ih);
out.println("\t" + Constants.OPCODE_NAMES[bi.getOpcode()] + " " + str);
}
- }
- else
- out.println("\t" + inst.toString(cp.getConstantPool()));
+ } else {
+ out.println("\t" + inst.toString(cp.getConstantPool()));
+ }
}
out.print("\n");
@@ -265,27 +275,28 @@
private final void put(InstructionHandle ih, String line) {
String str = (String)map.get(ih);
- if(str == null)
- map.put(ih, line);
- else {
- if(line.startsWith("Label") || str.endsWith(line)) // Already have a label in the map
- return;
+ if(str == null) {
+ map.put(ih, line);
+ } else {
+ if(line.startsWith("Label") || str.endsWith(line)) {
+ return;
+ }
map.put(ih, str + "\n" + line); // append
}
}
public static void main(String[] argv) {
- ClassParser parser=null;
JavaClass java_class;
try {
- if(argv.length == 0)
- System.err.println("disassemble: No input files specified");
- else {
+ if(argv.length == 0) {
+ System.err.println("disassemble: No input files specified");
+ } else {
for(int i=0; i < argv.length; i++) {
- if((java_class = Repository.lookupClass(argv[i])) == null)
- java_class = new ClassParser(argv[i]).parse();
+ if((java_class = Repository.lookupClass(argv[i])) == null) {
+ java_class = new ClassParser(argv[i]).parse();
+ }
String class_name = java_class.getClassName();
int index = class_name.lastIndexOf('.');
Modified: jakarta/bcel/trunk/examples/Mini/ASCII_CharStream.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/ASCII_CharStream.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/ASCII_CharStream.java (original)
+++ jakarta/bcel/trunk/examples/Mini/ASCII_CharStream.java Wed Mar 15 03:31:56 2006
@@ -89,17 +89,19 @@
bufpos = maxNextCharInd = 0;
available = tokenBegin;
}
- else if (tokenBegin < 0)
- bufpos = maxNextCharInd = 0;
- else
- ExpandBuff(false);
+ else if (tokenBegin < 0) {
+ bufpos = maxNextCharInd = 0;
+ } else {
+ ExpandBuff(false);
+ }
+ }
+ else if (available > tokenBegin) {
+ available = bufsize;
+ } else if ((tokenBegin - available) < 2048) {
+ ExpandBuff(true);
+ } else {
+ available = tokenBegin;
}
- else if (available > tokenBegin)
- available = bufsize;
- else if ((tokenBegin - available) < 2048)
- ExpandBuff(true);
- else
- available = tokenBegin;
}
int i;
@@ -109,16 +111,17 @@
{
inputStream.close();
throw new java.io.IOException();
+ } else {
+ maxNextCharInd += i;
}
- else
- maxNextCharInd += i;
return;
}
catch(java.io.IOException e) {
--bufpos;
backup(0);
- if (tokenBegin == -1)
- tokenBegin = bufpos;
+ if (tokenBegin == -1) {
+ tokenBegin = bufpos;
+ }
throw e;
}
}
@@ -147,9 +150,9 @@
if (c == '\n')
{
prevCharIsLF = true;
+ } else {
+ line += (column = 1);
}
- else
- line += (column = 1);
}
switch (c)
@@ -180,8 +183,9 @@
return (char)((char)0xff & buffer[(bufpos == bufsize - 1) ? (bufpos = 0) : ++bufpos]);
}
- if (++bufpos >= maxNextCharInd)
+ if (++bufpos >= maxNextCharInd) {
FillBuff();
+ }
char c = (char)((char)0xff & buffer[bufpos]);
@@ -226,17 +230,19 @@
static public final void backup(int amount) {
inBuf += amount;
- if ((bufpos -= amount) < 0)
- bufpos += bufsize;
+ if ((bufpos -= amount) < 0) {
+ bufpos += bufsize;
+ }
}
public ASCII_CharStream(java.io.Reader dstream, int startline,
int startcolumn, int buffersize)
{
- if (inputStream != null)
- throw new Error("\n ERROR: Second call to the constructor of a static ASCII_CharStream. You must\n" +
- " either use ReInit() or set the JavaCC option STATIC to false\n" +
- " during the generation of this class.");
+ if (inputStream != null) {
+ throw new Error("\n ERROR: Second call to the constructor of a static ASCII_CharStream. You must\n" +
+ " either use ReInit() or set the JavaCC option STATIC to false\n" +
+ " during the generation of this class.");
+ }
inputStream = dstream;
line = startline;
column = startcolumn - 1;
@@ -300,20 +306,21 @@
}
static public final String GetImage()
{
- if (bufpos >= tokenBegin)
+ if (bufpos >= tokenBegin) {
return new String(buffer, tokenBegin, bufpos - tokenBegin + 1);
- else
+ } else {
return new String(buffer, tokenBegin, bufsize - tokenBegin) +
new String(buffer, 0, bufpos + 1);
+ }
}
static public final char[] GetSuffix(int len)
{
char[] ret = new char[len];
- if ((bufpos + 1) >= len)
+ if ((bufpos + 1) >= len) {
System.arraycopy(buffer, bufpos - len + 1, ret, 0, len);
- else
+ } else
{
System.arraycopy(buffer, bufsize - (len - bufpos - 1), ret, 0,
len - bufpos - 1);
@@ -367,10 +374,11 @@
while (i++ < len)
{
- if (bufline[j = start % bufsize] != bufline[++start % bufsize])
- bufline[j] = newLine++;
- else
- bufline[j] = newLine;
+ if (bufline[j = start % bufsize] != bufline[++start % bufsize]) {
+ bufline[j] = newLine++;
+ } else {
+ bufline[j] = newLine;
+ }
}
}
Modified: jakarta/bcel/trunk/examples/Mini/ASTExpr.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/ASTExpr.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/ASTExpr.java (original)
+++ jakarta/bcel/trunk/examples/Mini/ASTExpr.java Wed Mar 15 03:31:56 2006
@@ -83,10 +83,11 @@
public String toString() {
String op="";
int len = (children != null)? children.length : 0;
- if(unop != -1)
- op = tokenImage[unop];
- else if(kind != -1)
- op = tokenImage[kind];
+ if(unop != -1) {
+ op = tokenImage[unop];
+ } else if(kind != -1) {
+ op = tokenImage[kind];
+ }
return jjtNodeName[id] + "(" + op + ")[" + len + "]<" +
TYPE_NAMES[type] + "> @" + line + ", " + column;
@@ -114,11 +115,12 @@
public ASTExpr traverse(Environment env) {
this.env = env;
- if((kind == -1) && (unop == -1)) // Redundant node (built thru op precedence) ?
- return exprs[0].traverse(env); // --> Replaced by successor
- else {
- for(int i=0; i < exprs.length; i++) // Traverse children
- exprs[i] = exprs[i].traverse(env); // References may change
+ if((kind == -1) && (unop == -1)) {
+ return exprs[0].traverse(env); // --> Replaced by successor
+ } else {
+ for(int i=0; i < exprs.length; i++) {
+ exprs[i] = exprs[i].traverse(env); // References may change
+ }
return this;
}
@@ -136,19 +138,20 @@
// Determine expected node type depending on used operator.
if(unop != -1) {
- if(unop == MINUS)
- child_type = type = T_INT; // -
- else
- child_type = type = T_BOOLEAN; // !
+ if(unop == MINUS) {
+ child_type = type = T_INT; // -
+ } else {
+ child_type = type = T_BOOLEAN; // !
+ }
}
else {
// Compute expected type
if((kind == PLUS) || (kind == MINUS) || (kind == MULT) ||
- (kind == MOD) || (kind == DIV))
- child_type = type = T_INT;
- else if((kind == AND) || (kind == OR))
- child_type = type = T_BOOLEAN;
- else { // LEQ, GT, etc.
+ (kind == MOD) || (kind == DIV)) {
+ child_type = type = T_INT;
+ } else if((kind == AND) || (kind == OR)) {
+ child_type = type = T_BOOLEAN;
+ } else { // LEQ, GT, etc.
child_type = T_INT;
type = T_BOOLEAN;
}
@@ -158,10 +161,11 @@
for(int i=0; i < exprs.length; i++) {
t = exprs[i].eval(child_type);
- if(t != child_type)
- MiniC.addError(exprs[i].getLine(), exprs[i].getColumn(),
- "Expression has not expected type " + TYPE_NAMES[child_type] +
- " but " + TYPE_NAMES[t] + ".");
+ if(t != child_type) {
+ MiniC.addError(exprs[i].getLine(), exprs[i].getColumn(),
+ "Expression has not expected type " + TYPE_NAMES[child_type] +
+ " but " + TYPE_NAMES[t] + ".");
+ }
is_simple = is_simple && exprs[i].isSimple();
}
@@ -184,10 +188,11 @@
if(unop != -1) {
exprs[0].code(buf);
String top = ASTFunDecl.pop();
- if(unop == MINUS)
- ASTFunDecl.push(buf, "-" + top);
- else
- ASTFunDecl.push(buf, "(" + top + " == 1)? 0 : 1)");
+ if(unop == MINUS) {
+ ASTFunDecl.push(buf, "-" + top);
+ } else {
+ ASTFunDecl.push(buf, "(" + top + " == 1)? 0 : 1)");
+ }
}
else {
exprs[0].code(buf);
@@ -231,9 +236,9 @@
exprs[0].byte_code(il, method, cp);
if(unop != -1) { // Apply unary operand
- if(unop == MINUS)
- il.append(InstructionConstants.INEG);
- else { // == NOT
+ if(unop == MINUS) {
+ il.append(InstructionConstants.INEG);
+ } else { // == NOT
il.append(new PUSH(cp, 1)); ASTFunDecl.push(); // Push TRUE
il.append(InstructionConstants.IXOR); ASTFunDecl.pop();
}
@@ -296,8 +301,10 @@
public void dump(String prefix) {
System.out.println(toString(prefix));
- if(exprs != null) // Children may have no subchildren
- for(int i=0; i < exprs.length; ++i)
- exprs[i].dump(prefix + " ");
+ if(exprs != null) {
+ for(int i=0; i < exprs.length; ++i) {
+ exprs[i].dump(prefix + " ");
+ }
+ }
}
}
Modified: jakarta/bcel/trunk/examples/Mini/ASTFactor.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/ASTFactor.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/ASTFactor.java (original)
+++ jakarta/bcel/trunk/examples/Mini/ASTFactor.java Wed Mar 15 03:31:56 2006
@@ -29,9 +29,10 @@
* and may be safely replaced with it.
*/
public ASTExpr traverse(Environment env) {
- if(kind == -1) // Drop it
- return exprs[0].traverse(env);
- else // Or convert it to Expr node & copy children
- return new ASTExpr(exprs, kind, line, column).traverse(env);
+ if(kind == -1) {
+ return exprs[0].traverse(env);
+ } else {
+ return new ASTExpr(exprs, kind, line, column).traverse(env);
+ }
}
}
Modified: jakarta/bcel/trunk/examples/Mini/ASTFunAppl.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/ASTFunAppl.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/ASTFunAppl.java (original)
+++ jakarta/bcel/trunk/examples/Mini/ASTFunAppl.java Wed Mar 15 03:31:56 2006
@@ -66,31 +66,33 @@
this.env = env;
- if(entry == null) // Applying unknown function
- MiniC.addError(name.getLine(), name.getColumn(),
- "Applying unknown function " + fname + ".");
- else {
- if(!(entry instanceof Function))
- MiniC.addError(name.getLine(), name.getColumn(),
- "Applying non-function " + fname + ".");
- else {
+ if(entry == null) {
+ MiniC.addError(name.getLine(), name.getColumn(),
+ "Applying unknown function " + fname + ".");
+ } else {
+ if(!(entry instanceof Function)) {
+ MiniC.addError(name.getLine(), name.getColumn(),
+ "Applying non-function " + fname + ".");
+ } else {
int len = (exprs != null)? exprs.length : 0;
Function fun = (Function)entry;
- if(len != fun.getNoArgs())
- MiniC.addError(name.getLine(), name.getColumn(),
- "Function " + fname + " expects " + fun.getNoArgs() +
- " arguments, you supplied " + len + ".");
- else { // Adjust references
+ if(len != fun.getNoArgs()) {
+ MiniC.addError(name.getLine(), name.getColumn(),
+ "Function " + fname + " expects " + fun.getNoArgs() +
+ " arguments, you supplied " + len + ".");
+ } else { // Adjust references
function = fun;
name = fun.getName();
}
}
}
- if(exprs != null) // Argument list may be empty
- for(int i=0; i < exprs.length; i++)
- exprs[i] = exprs[i].traverse(env);
+ if(exprs != null) {
+ for(int i=0; i < exprs.length; i++) {
+ exprs[i] = exprs[i].traverse(env);
+ }
+ }
return this;
}
@@ -116,20 +118,22 @@
int expect = args[i].getType(); // May be T_UNKNOWN
int t_e = exprs[i].eval(expect); // May be T_UNKNOWN
- if((expect != T_UNKNOWN) && (t_e != expect))
- MiniC.addError(exprs[i].getLine(), exprs[i].getColumn(),
- "Argument " + (i + 1) + " in application of " + fname +
- " is not of type " + TYPE_NAMES[expect] + " but " +
- TYPE_NAMES[t_e]);
- else
- args[i].setType(t_e); // Update, may be identical
+ if((expect != T_UNKNOWN) && (t_e != expect)) {
+ MiniC.addError(exprs[i].getLine(), exprs[i].getColumn(),
+ "Argument " + (i + 1) + " in application of " + fname +
+ " is not of type " + TYPE_NAMES[expect] + " but " +
+ TYPE_NAMES[t_e]);
+ } else {
+ args[i].setType(t_e); // Update, may be identical
+ }
is_simple = is_simple && exprs[i].isSimple(); // Check condition
}
}
- if(t == T_UNKNOWN) // Function type yet unknown
- fun.setType(t = expected); // May be still T_UNKNOWN
+ if(t == T_UNKNOWN) {
+ fun.setType(t = expected); // May be still T_UNKNOWN
+ }
return type = t;
}
@@ -142,16 +146,17 @@
Function f = function;
ASTIdent[] args = f.getArgs();
- if(fname.equals("READ"))
- ASTFunDecl.push(buf, "_readInt()");
- else if(fname.equals("WRITE")) {
+ if(fname.equals("READ")) {
+ ASTFunDecl.push(buf, "_readInt()");
+ } else if(fname.equals("WRITE")) {
exprs[0].code(buf);
ASTFunDecl.push(buf, "_writeInt(" + ASTFunDecl.pop() + ")");
}
else { // Normal function
if(exprs != null) { // Output in reverse odrder
- for(int i = exprs.length - 1; i >= 0; i--)
- exprs[i].code(buf);
+ for(int i = exprs.length - 1; i >= 0; i--) {
+ exprs[i].code(buf);
+ }
}
StringBuffer call = new StringBuffer(fname + "(");
@@ -160,8 +165,9 @@
if(exprs != null) {
for(int i=0; i < exprs.length; i++) {
call.append(ASTFunDecl.pop());
- if(i < exprs.length - 1)
- call.append(", ");
+ if(i < exprs.length - 1) {
+ call.append(", ");
+ }
}
}
call.append(")");
@@ -180,11 +186,11 @@
ASTIdent[] args = f.getArgs();
String class_name = method.getClassName();
- if(fname.equals("READ"))
- il.append(new INVOKESTATIC(cp.addMethodref(class_name,
- "_readInt",
- "()I")));
- else if(fname.equals("WRITE")) {
+ if(fname.equals("READ")) {
+ il.append(new INVOKESTATIC(cp.addMethodref(class_name,
+ "_readInt",
+ "()I")));
+ } else if(fname.equals("WRITE")) {
exprs[0].byte_code(il, method, cp);
ASTFunDecl.pop();
il.append(new INVOKESTATIC(cp.addMethodref(class_name,
Modified: jakarta/bcel/trunk/examples/Mini/ASTFunDecl.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/ASTFunDecl.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/ASTFunDecl.java (original)
+++ jakarta/bcel/trunk/examples/Mini/ASTFunDecl.java Wed Mar 15 03:31:56 2006
@@ -73,8 +73,9 @@
body = (ASTExpr)children[children.length - 1];
argv = new ASTIdent[children.length - 2]; // May be 0-size array
- for(int i = 1; i < children.length - 1; i++)
- argv[i - 1] = (ASTIdent)children[i];
+ for(int i = 1; i < children.length - 1; i++) {
+ argv[i - 1] = (ASTIdent)children[i];
+ }
children=null; // Throw away old reference
}
@@ -89,11 +90,12 @@
for(int i=0; i < argv.length; i++) {
EnvEntry entry = env.get(argv[i].getName());
- if(entry != null)
- MiniC.addError(argv[i].getLine(), argv[i].getColumn(),
- "Redeclaration of " + entry + ".");
- else
- env.put(new Variable(argv[i]));
+ if(entry != null) {
+ MiniC.addError(argv[i].getLine(), argv[i].getColumn(),
+ "Redeclaration of " + entry + ".");
+ } else {
+ env.put(new Variable(argv[i]));
+ }
}
/* Update entry of this function, i.e. set argument references.
@@ -117,17 +119,19 @@
int expected = name.getType(); // Maybe other function has already called us
type = body.eval(expected); // And updated the env
- if((expected != T_UNKNOWN) && (type != expected))
- MiniC.addError(line, column,
- "Function f ist not of type " + TYPE_NAMES[expected] +
- " as previously assumed, but " + TYPE_NAMES[type]);
+ if((expected != T_UNKNOWN) && (type != expected)) {
+ MiniC.addError(line, column,
+ "Function f ist not of type " + TYPE_NAMES[expected] +
+ " as previously assumed, but " + TYPE_NAMES[type]);
+ }
name.setType(type);
is_simple = body.isSimple();
- if(pass == 2 && type == T_UNKNOWN)
- is_recursive = true;
+ if(pass == 2 && type == T_UNKNOWN) {
+ is_recursive = true;
+ }
return type;
}
@@ -155,8 +159,9 @@
for(int i = 0; i < argv.length; i++) {
out.print("int " + argv[i].getName());
- if(i < argv.length - 1)
- out.print(", ");
+ if(i < argv.length - 1) {
+ out.print(", ");
+ }
}
out.println(")\n throws IOException\n {");
@@ -170,15 +175,17 @@
expr = buf.toString();
- if(main)
- out.println(" try {");
+ if(main) {
+ out.println(" try {");
+ }
out.println(expr);
- if(main)
- out.println(" } catch(Exception e) { System.err.println(e); }\n }\n");
- else
- out.println("\n return " + pop() + ";\n }\n");
+ if(main) {
+ out.println(" } catch(Exception e) { System.err.println(e); }\n }\n");
+ } else {
+ out.println("\n return " + pop() + ";\n }\n");
+ }
}
reset();
@@ -255,9 +262,9 @@
end_handler = il.append(InstructionConstants.RETURN);
method.addExceptionHandler(start, end, handler, e_type);
exc.setStart(handler); exc.setEnd(end_handler);
- }
- else
- il.append(InstructionConstants.IRETURN); // Reuse object to save memory
+ } else {
+ il.append(InstructionConstants.IRETURN); // Reuse object to save memory
+ }
method.removeNOPs(); // First optimization pass, provided by MethodGen
optimizeIFs(il); // Second optimization pass, application-specific
@@ -297,8 +304,6 @@
for(Iterator it = f.search(pat, my_constraint); it.hasNext();) {
InstructionHandle[] match = (InstructionHandle[])it.next();
- int len = match.length;
-
// Everything ok, update code
BranchInstruction ifeq = (BranchInstruction)(match[4].getInstruction());
BranchHandle if_icmp = (BranchHandle)match[0];
@@ -315,9 +320,11 @@
for(int i=0; i < targets.length; i++) {
InstructionTargeter[] targeters = targets[i].getTargeters();
- for(int j=0; j < targeters.length; j++)
- if((targets[i] != match[4]) || (targeters[j] != match[2]))
- System.err.println("Ooops: " + e);
+ for(int j=0; j < targeters.length; j++) {
+ if((targets[i] != match[4]) || (targeters[j] != match[2])) {
+ System.err.println("Ooops: " + e);
+ }
+ }
}
}
}
@@ -332,8 +339,9 @@
for(int i = 0; i < argv.length; i++) {
buf.append(argv[i].getName());
- if(i < argv.length - 1)
- buf.append(", ");
+ if(i < argv.length - 1) {
+ buf.append(", ");
+ }
}
buf.append(")");
@@ -362,8 +370,9 @@
public void dump(String prefix) {
System.out.println(toString(prefix));
- for(int i = 0; i < argv.length; i++)
- argv[i].dump(prefix + " ");
+ for(int i = 0; i < argv.length; i++) {
+ argv[i].dump(prefix + " ");
+ }
body.dump(prefix + " ");
}
@@ -380,8 +389,9 @@
for(int i=0; i < max_size; i++) {
buf.append("_s" + i);
- if(i < max_size - 1)
- buf.append(", ");
+ if(i < max_size - 1) {
+ buf.append(", ");
+ }
}
buf.append(";\n");
@@ -394,8 +404,9 @@
static final void push(int s) {
size += s;
- if(size > max_size)
- max_size = size;
+ if(size > max_size) {
+ max_size = size;
+ }
}
static final void push() { push(1); }
Modified: jakarta/bcel/trunk/examples/Mini/ASTIdent.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/ASTIdent.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/ASTIdent.java (original)
+++ jakarta/bcel/trunk/examples/Mini/ASTIdent.java Wed Mar 15 03:31:56 2006
@@ -53,13 +53,14 @@
public ASTExpr traverse(Environment env) {
EnvEntry entry = env.get(name);
- if(entry == null)
- MiniC.addError(line, column, "Undeclared identifier " + name);
- else if(entry instanceof Function)
- MiniC.addError(line, column,
- "Function " + name + " used as an identifier.");
- else
- reference = (Variable)entry;
+ if(entry == null) {
+ MiniC.addError(line, column, "Undeclared identifier " + name);
+ } else if(entry instanceof Function) {
+ MiniC.addError(line, column,
+ "Function " + name + " used as an identifier.");
+ } else {
+ reference = (Variable)entry;
+ }
return this; // Nothing to reduce/traverse further here
}
@@ -73,18 +74,18 @@
is_simple = true; // (Very) simple expression, always true
- if((t == T_UNKNOWN) && (expected == T_UNKNOWN))
- type = T_UNKNOWN;
- else if((t == T_UNKNOWN) && (expected != T_UNKNOWN)) {
+ if((t == T_UNKNOWN) && (expected == T_UNKNOWN)) {
+ type = T_UNKNOWN;
+ } else if((t == T_UNKNOWN) && (expected != T_UNKNOWN)) {
ident.setType(expected);
type = expected;
}
else if((t != T_UNKNOWN) && (expected == T_UNKNOWN)) {
ident.setType(t);
type = t;
+ } else {
+ type = t; // Caller has to check for an error, i.e. t != expected
}
- else // (t != T_UNKNOWN) && (expected != T_UNKNOWN)
- type = t; // Caller has to check for an error, i.e. t != expected
return type;
}
@@ -93,23 +94,24 @@
* Fourth pass, produce Java code.
*/
public void code(StringBuffer buf) {
- if(name.equals("TRUE"))
- ASTFunDecl.push(buf, "1");
- else if(name.equals("FALSE"))
- ASTFunDecl.push(buf, "0");
- else
- ASTFunDecl.push(buf, name);
+ if(name.equals("TRUE")) {
+ ASTFunDecl.push(buf, "1");
+ } else if(name.equals("FALSE")) {
+ ASTFunDecl.push(buf, "0");
+ } else {
+ ASTFunDecl.push(buf, name);
+ }
}
/**
* Fifth pass, produce Java byte code.
*/
public void byte_code(InstructionList il, MethodGen method, ConstantPoolGen cp) {
- if(name.equals("TRUE"))
- il.append(new PUSH(cp, 1));
- else if(name.equals("FALSE"))
- il.append(new PUSH(cp, 0));
- else {
+ if(name.equals("TRUE")) {
+ il.append(new PUSH(cp, 1));
+ } else if(name.equals("FALSE")) {
+ il.append(new PUSH(cp, 0));
+ } else {
LocalVariableGen local_var = reference.getLocalVariable();
il.append(new ILOAD(local_var.getIndex()));
}
Modified: jakarta/bcel/trunk/examples/Mini/ASTIfExpr.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/ASTIfExpr.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/ASTIfExpr.java (original)
+++ jakarta/bcel/trunk/examples/Mini/ASTIfExpr.java Wed Mar 15 03:31:56 2006
@@ -39,11 +39,12 @@
if_expr = (ASTExpr)children[0];
then_expr = (ASTExpr)children[1];
- if(children.length == 3) // has else branch
- else_expr = (ASTExpr)children[2];
- else
- MiniC.addError(if_expr.getLine(), if_expr.getColumn(),
- "IF expression has no ELSE branch");
+ if(children.length == 3) {
+ else_expr = (ASTExpr)children[2];
+ } else {
+ MiniC.addError(if_expr.getLine(), if_expr.getColumn(),
+ "IF expression has no ELSE branch");
+ }
children=null; // Throw away
}
@@ -57,8 +58,9 @@
if_expr = if_expr.traverse(env);
then_expr = then_expr.traverse(env);
- if(else_expr != null)
- else_expr = else_expr.traverse(env);
+ if(else_expr != null) {
+ else_expr = else_expr.traverse(env);
+ }
return this;
}
@@ -72,26 +74,28 @@
public int eval(int expected) {
int then_type, else_type, if_type;
- if((if_type=if_expr.eval(T_BOOLEAN)) != T_BOOLEAN)
- MiniC.addError(if_expr.getLine(), if_expr.getColumn(),
- "IF expression is not of type boolean, but " +
- TYPE_NAMES[if_type] + ".");
+ if((if_type=if_expr.eval(T_BOOLEAN)) != T_BOOLEAN) {
+ MiniC.addError(if_expr.getLine(), if_expr.getColumn(),
+ "IF expression is not of type boolean, but " +
+ TYPE_NAMES[if_type] + ".");
+ }
then_type=then_expr.eval(expected);
- if((expected != T_UNKNOWN) && (then_type != expected))
- MiniC.addError(then_expr.getLine(), then_expr.getColumn(),
- "THEN expression is not of expected type " +
- TYPE_NAMES[expected] + " but " + TYPE_NAMES[then_type] + ".");
+ if((expected != T_UNKNOWN) && (then_type != expected)) {
+ MiniC.addError(then_expr.getLine(), then_expr.getColumn(),
+ "THEN expression is not of expected type " +
+ TYPE_NAMES[expected] + " but " + TYPE_NAMES[then_type] + ".");
+ }
if(else_expr != null) {
else_type = else_expr.eval(expected);
- if((expected != T_UNKNOWN) && (else_type != expected))
- MiniC.addError(else_expr.getLine(), else_expr.getColumn(),
- "ELSE expression is not of expected type " +
- TYPE_NAMES[expected] + " but " + TYPE_NAMES[else_type] + ".");
- else if(then_type == T_UNKNOWN) {
+ if((expected != T_UNKNOWN) && (else_type != expected)) {
+ MiniC.addError(else_expr.getLine(), else_expr.getColumn(),
+ "ELSE expression is not of expected type " +
+ TYPE_NAMES[expected] + " but " + TYPE_NAMES[else_type] + ".");
+ } else if(then_type == T_UNKNOWN) {
then_type = else_type;
then_expr.setType(else_type);
}
@@ -101,10 +105,11 @@
else_expr = then_expr;
}
- if(then_type != else_type)
- MiniC.addError(line, column,
- "Type mismatch in THEN-ELSE: " +
- TYPE_NAMES[then_type] + " vs. " + TYPE_NAMES[else_type] + ".");
+ if(then_type != else_type) {
+ MiniC.addError(line, column,
+ "Type mismatch in THEN-ELSE: " +
+ TYPE_NAMES[then_type] + " vs. " + TYPE_NAMES[else_type] + ".");
+ }
type = then_type;
@@ -155,7 +160,8 @@
if_expr.dump(prefix + " ");
then_expr.dump(prefix + " ");
- if(else_expr != null)
- else_expr.dump(prefix + " ");
+ if(else_expr != null) {
+ else_expr.dump(prefix + " ");
+ }
}
}
Modified: jakarta/bcel/trunk/examples/Mini/ASTLetExpr.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/ASTLetExpr.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/ASTLetExpr.java (original)
+++ jakarta/bcel/trunk/examples/Mini/ASTLetExpr.java Wed Mar 15 03:31:56 2006
@@ -62,8 +62,9 @@
this.env = env;
// Traverse RHS exprs first, so no references to LHS vars are allowed
- for(int i=0; i < exprs.length; i++)
- exprs[i] = exprs[i].traverse((Environment)env.clone());
+ for(int i=0; i < exprs.length; i++) {
+ exprs[i] = exprs[i].traverse((Environment)env.clone());
+ }
// Put argument names into hash table aka. environment
for(int i=0; i < idents.length; i++) {
@@ -71,11 +72,12 @@
String name = id.getName();
EnvEntry entry = env.get(name);
- if(entry != null)
- MiniC.addError(id.getLine(), id.getColumn(),
- "Redeclaration of " + entry + ".");
- else
- env.put(new Variable(id));
+ if(entry != null) {
+ MiniC.addError(id.getLine(), id.getColumn(),
+ "Redeclaration of " + entry + ".");
+ } else {
+ env.put(new Variable(id));
+ }
}
body = body.traverse(env);
@@ -147,8 +149,9 @@
body.byte_code(il, method, cp);
InstructionHandle end = il.getEnd();
- for(int i=0; i < size; i++)
- l[i].setEnd(end);
+ for(int i=0; i < size; i++) {
+ l[i].setEnd(end);
+ }
}
public void dump(String prefix) {
Modified: jakarta/bcel/trunk/examples/Mini/ASTProgram.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/ASTProgram.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/ASTProgram.java (original)
+++ jakarta/bcel/trunk/examples/Mini/ASTProgram.java Wed Mar 15 03:31:56 2006
@@ -106,11 +106,12 @@
fname = name.getName();
fun = env.get(fname); // Lookup in env
- if(fun != null)
- MiniC.addError(f.getLine(), f.getColumn(),
- "Redeclaration of " + fun + ".");
- else
- env.put(new Function(name, null)); // `args' will be set by FunDecl.traverse()
+ if(fun != null) {
+ MiniC.addError(f.getLine(), f.getColumn(),
+ "Redeclaration of " + fun + ".");
+ } else {
+ env.put(new Function(name, null)); // `args' will be set by FunDecl.traverse()
+ }
}
@@ -121,15 +122,17 @@
// Look for `main' routine
fname = fun_decls[i].getName().getName();
- if(fname.equals("main"))
- main = (Function)env.get(fname);
+ if(fname.equals("main")) {
+ main = (Function)env.get(fname);
+ }
}
- if(main == null)
- MiniC.addError(0, 0, "You didn't declare a `main' function.");
- else if(main.getNoArgs() != 0)
- MiniC.addError(main.getLine(), main.getColumn(),
- "Main function has too many arguments declared.");
+ if(main == null) {
+ MiniC.addError(0, 0, "You didn't declare a `main' function.");
+ } else if(main.getNoArgs() != 0) {
+ MiniC.addError(main.getLine(), main.getColumn(),
+ "Main function has too many arguments declared.");
+ }
}
return this;
@@ -147,10 +150,11 @@
if(pass == 3) { // Final check for unresolved types
ASTIdent name = fun_decls[i].getName();
- if(name.getType() == T_UNKNOWN)
- MiniC.addError(name.getColumn(), name.getLine(),
- "Type of function " + name.getName() +
- " can not be determined (infinite recursion?).");
+ if(name.getType() == T_UNKNOWN) {
+ MiniC.addError(name.getColumn(), name.getLine(),
+ "Type of function " + name.getName() +
+ " can not be determined (infinite recursion?).");
+ }
}
}
}
@@ -174,8 +178,9 @@
out.println(" private static final int _writeInt(int n) {\n" +
" System.out.println(\"Result: \" + n);\n return 0;\n }\n");
- for(int i=0; i < fun_decls.length; i++)
- fun_decls[i].code(out);
+ for(int i=0; i < fun_decls.length; i++) {
+ fun_decls[i].code(out);
+ }
out.println("}");
}
@@ -192,9 +197,7 @@
null, cp.getConstantPool()));
MethodGen method;
- Method m;
InstructionList il = new InstructionList();
- byte[] byte_code;
String class_name = class_gen.getClassName();
/* Often used constant pool entries
@@ -303,14 +306,16 @@
method.setMaxStack(5);
class_gen.addMethod(method.getMethod());
- for(int i=0; i < fun_decls.length; i++)
- fun_decls[i].byte_code(class_gen, cp);
+ for(int i=0; i < fun_decls.length; i++) {
+ fun_decls[i].byte_code(class_gen, cp);
+ }
}
public void dump(String prefix) {
System.out.println(toString(prefix));
- for(int i = 0; i < fun_decls.length; ++i)
- fun_decls[i].dump(prefix + " ");
+ for(int i = 0; i < fun_decls.length; ++i) {
+ fun_decls[i].dump(prefix + " ");
+ }
}
}
Modified: jakarta/bcel/trunk/examples/Mini/ASTTerm.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/ASTTerm.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/ASTTerm.java (original)
+++ jakarta/bcel/trunk/examples/Mini/ASTTerm.java Wed Mar 15 03:31:56 2006
@@ -29,9 +29,10 @@
* and may be safely replaced with it.
*/
public ASTExpr traverse(Environment env) {
- if(kind == -1) // Drop it
- return exprs[0].traverse(env);
- else // Or convert it to Expr node, copy children
- return new ASTExpr(exprs, kind, line, column).traverse(env);
+ if(kind == -1) {
+ return exprs[0].traverse(env);
+ } else {
+ return new ASTExpr(exprs, kind, line, column).traverse(env);
+ }
}
}
Modified: jakarta/bcel/trunk/examples/Mini/Environment.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/Environment.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/Environment.java (original)
+++ jakarta/bcel/trunk/examples/Mini/Environment.java Wed Mar 15 03:31:56 2006
@@ -55,9 +55,9 @@
elements++; // Count
- if(v == null) // Not yet initialized
- table[hash] = v = new Vector(SLOTS);
- else {
+ if(v == null) {
+ table[hash] = v = new Vector(SLOTS);
+ } else {
try {
int index = lookup(v, key);
@@ -82,14 +82,16 @@
hash = hashCode(key);
v = table[hash];
- if(v == null)
- return null;
+ if(v == null) {
+ return null;
+ }
try {
int index = lookup(v, key);
- if(index >= 0)
- entry = (EnvEntry)v.elementAt(index);
+ if(index >= 0) {
+ entry = (EnvEntry)v.elementAt(index);
+ }
} catch(ArrayIndexOutOfBoundsException e) {}
return entry;
@@ -105,8 +107,9 @@
hash = hashCode(key);
v = table[hash];
- if(v == null)
- return;
+ if(v == null) {
+ return;
+ }
try {
int index = lookup(v, key);
@@ -126,8 +129,9 @@
for(int i=0; i < len; i++) {
EnvEntry entry = (EnvEntry)v.elementAt(i);
- if(entry.getHashKey().equals(key)) // Found index
- return i;
+ if(entry.getHashKey().equals(key)) {
+ return i;
+ }
}
return -1;
@@ -157,9 +161,11 @@
public String toString() {
StringBuffer buf = new StringBuffer();
- for(int i=0; i < size; i++)
- if(table[i] != null)
- buf.append(table[i] + "\n");
+ for(int i=0; i < size; i++) {
+ if(table[i] != null) {
+ buf.append(table[i] + "\n");
+ }
+ }
return buf.toString();
}
@@ -173,8 +179,9 @@
if((v = table[i]) != null) {
int len = v.size();
try {
- for(int j=0; j < len; j++)
- entries[k++] = (EnvEntry)v.elementAt(j);
+ for(int j=0; j < len; j++) {
+ entries[k++] = (EnvEntry)v.elementAt(j);
+ }
} catch(ArrayIndexOutOfBoundsException e) {}
}
}
Modified: jakarta/bcel/trunk/examples/Mini/Function.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/Function.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/Function.java (original)
+++ jakarta/bcel/trunk/examples/Mini/Function.java Wed Mar 15 03:31:56 2006
@@ -37,16 +37,18 @@
for(int i=0; i < no_args; i++) {
buf.append(args[i].getName());
- if(i < no_args - 1)
- buf.append(", ");
+ if(i < no_args - 1) {
+ buf.append(", ");
+ }
}
String prefix = "Function " + fun_name + "(" + buf.toString() + ")";
- if(!reserved)
- return prefix + " declared at line " + line + ", column " + column;
- else
- return prefix + " <predefined function>";
+ if(!reserved) {
+ return prefix + " declared at line " + line + ", column " + column;
+ } else {
+ return prefix + " <predefined function>";
+ }
}
public int getNoArgs() { return no_args; }
Modified: jakarta/bcel/trunk/examples/Mini/MiniC.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/MiniC.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/MiniC.java (original)
+++ jakarta/bcel/trunk/examples/Mini/MiniC.java Wed Mar 15 03:31:56 2006
@@ -25,39 +25,44 @@
*/
for(int i=0; i < argv.length; i++) {
if(argv[i].charAt(0) == '-') { // command line switch
- if(argv[i].equals("-java"))
- byte_code=false;
- else if(argv[i].equals("-bytecode"))
- byte_code=true;
- else
- throw new Exception("Unknown option: " + argv[i]);
+ if(argv[i].equals("-java")) {
+ byte_code=false;
+ } else if(argv[i].equals("-bytecode")) {
+ byte_code=true;
+ } else {
+ throw new Exception("Unknown option: " + argv[i]);
+ }
}
else { // add file name to list
file_name[files++] = argv[i];
}
}
- if(files == 0)
- System.err.println("Nothing to compile.");
+ if(files == 0) {
+ System.err.println("Nothing to compile.");
+ }
for(int j=0; j < files; j++) {
errors = new Vector();
warnings = new Vector();
pass = 0;
- if(j == 0)
- parser = new MiniParser(new java.io.FileInputStream(file_name[0]));
- else
- parser.ReInit(new java.io.FileInputStream(file_name[j]));
+ if(j == 0) {
+ parser = new MiniParser(new java.io.FileInputStream(file_name[0]));
+ } else {
+ parser.ReInit(new java.io.FileInputStream(file_name[j]));
+ }
int index = file_name[j].lastIndexOf('.');
- if(index > 0)
- base_name = file_name[j].substring(0, index);
- else
- base_name = file_name[j];
+ if(index > 0) {
+ base_name = file_name[j].substring(0, index);
+ } else {
+ base_name = file_name[j];
+ }
- if((index = base_name.lastIndexOf(File.separatorChar)) > 0)
- base_name = base_name.substring(index + 1);
+ if((index = base_name.lastIndexOf(File.separatorChar)) > 0) {
+ base_name = base_name.substring(index + 1);
+ }
file = file_name[j];
@@ -80,11 +85,13 @@
program.eval(pass=3);
}
- for(int i=0; i < errors.size(); i++)
- System.out.println(errors.elementAt(i));
-
- for(int i=0; i < warnings.size(); i++)
- System.out.println(warnings.elementAt(i));
+ for(int i=0; i < errors.size(); i++) {
+ System.out.println(errors.elementAt(i));
+ }
+
+ for(int i=0; i < warnings.size(); i++) {
+ System.out.println(warnings.elementAt(i));
+ }
if(errors.size() == 0) {
if(byte_code) {
@@ -118,18 +125,20 @@
}
}
- if((errors.size() > 0) || (warnings.size() > 0))
- System.out.println(errors.size() + " errors and " + warnings.size() +
- " warnings.");
+ if((errors.size() > 0) || (warnings.size() > 0)) {
+ System.out.println(errors.size() + " errors and " + warnings.size() +
+ " warnings.");
+ }
}
} catch(Exception e) { e.printStackTrace(); }
}
final static void addError(int line, int column, String err) {
- if(pass != 2)
- errors.addElement(file + ":" + fillup(line, 3) + "," + fillup(column, 2) +
- ": " + err);
+ if(pass != 2) {
+ errors.addElement(file + ":" + fillup(line, 3) + "," + fillup(column, 2) +
+ ": " + err);
+ }
}
final static void addWarning(int line, int column, String err) {
@@ -144,13 +153,14 @@
if(diff > 0) {
char[] chs = new char[diff];
- for(int i=0; i < diff; i++)
- chs[i] = ' ';
+ for(int i=0; i < diff; i++) {
+ chs[i] = ' ';
+ }
return new String(chs) + str;
+ } else {
+ return str;
}
- else
- return str;
}
final static void addWarning(String err) { warnings.addElement(err); }
Modified: jakarta/bcel/trunk/examples/Mini/MiniParser.java
URL: http://svn.apache.org/viewcvs/jakarta/bcel/trunk/examples/Mini/MiniParser.java?rev=386056&r1=386055&r2=386056&view=diff
==============================================================================
--- jakarta/bcel/trunk/examples/Mini/MiniParser.java (original)
+++ jakarta/bcel/trunk/examples/Mini/MiniParser.java Wed Mar 15 03:31:56 2006
@@ -38,12 +38,18 @@
jjtree.popNode();
}
if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
+ {if (true) {
+ throw (ParseException)jjte000;
+ }}
}
if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ {if (true) {
+ throw (RuntimeException)jjte000;
+ }}
+ }
+ {if (true) {
+ throw (Error)jjte000;
+ }}
} finally {
if (jjtc000) {
jjtree.closeNodeScope(jjtn000, true);
@@ -59,8 +65,7 @@
ASTFunDecl jjtn000 = new ASTFunDecl(JJTFUNDECL);
boolean jjtc000 = true;
jjtree.openNodeScope(jjtn000);
- jjtreeOpenNodeScope(jjtn000);String s;
- Token t;
+ jjtreeOpenNodeScope(jjtn000);Token t;
try {
t = jj_consume_token(9);
jjtn000.setPosition(t.beginLine, t.beginColumn);
@@ -102,12 +107,18 @@
jjtree.popNode();
}
if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
+ {if (true) {
+ throw (ParseException)jjte000;
+ }}
}
if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ {if (true) {
+ throw (RuntimeException)jjte000;
+ }}
+ }
+ {if (true) {
+ throw (Error)jjte000;
+ }}
} finally {
if (jjtc000) {
jjtree.closeNodeScope(jjtn000, true);
@@ -171,12 +182,18 @@
jjtree.popNode();
}
if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
+ {if (true) {
+ throw (ParseException)jjte000;
+ }}
}
if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ {if (true) {
+ throw (RuntimeException)jjte000;
+ }}
+ }
+ {if (true) {
+ throw (Error)jjte000;
+ }}
} finally {
if (jjtc000) {
jjtree.closeNodeScope(jjtn000, true);
@@ -220,12 +237,18 @@
jjtree.popNode();
}
if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
+ {if (true) {
+ throw (ParseException)jjte000;
+ }}
}
if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ {if (true) {
+ throw (RuntimeException)jjte000;
+ }}
+ }
+ {if (true) {
+ throw (Error)jjte000;
+ }}
} finally {
if (jjtc000) {
jjtree.closeNodeScope(jjtn000, true);
@@ -271,12 +294,18 @@
jjtree.popNode();
}
if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
+ {if (true) {
+ throw (ParseException)jjte000;
+ }}
}
if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ {if (true) {
+ throw (RuntimeException)jjte000;
+ }}
+ }
+ {if (true) {
+ throw (Error)jjte000;
+ }}
} finally {
if (jjtc000) {
jjtree.closeNodeScope(jjtn000, true);
@@ -330,7 +359,9 @@
jjtree.closeNodeScope(jjtn000, true);
jjtc000 = false;
jjtreeCloseNodeScope(jjtn000);
- {if (true) return t;}
+ {if (true) {
+ return t;
+ }}
} catch (Throwable jjte000) {
if (jjtc000) {
jjtree.clearNodeScope(jjtn000);
@@ -339,12 +370,18 @@
jjtree.popNode();
}
if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
+ {if (true) {
+ throw (ParseException)jjte000;
+ }}
}
if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ {if (true) {
+ throw (RuntimeException)jjte000;
+ }}
+ }
+ {if (true) {
+ throw (Error)jjte000;
+ }}
} finally {
if (jjtc000) {
jjtree.closeNodeScope(jjtn000, true);
@@ -387,12 +424,18 @@
jjtree.popNode();
}
if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
+ {if (true) {
+ throw (ParseException)jjte000;
+ }}
}
if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ {if (true) {
+ throw (RuntimeException)jjte000;
+ }}
+ }
+ {if (true) {
+ throw (Error)jjte000;
+ }}
} finally {
if (jjtc000) {
jjtree.closeNodeScope(jjtn000, true);
@@ -436,12 +479,18 @@
jjtree.popNode();
}
if (jjte000 instanceof ParseException) {
- {if (true) throw (ParseException)jjte000;}
+ {if (true) {
+ throw (ParseException)jjte000;
+ }}
}
if (jjte000 instanceof RuntimeException) {
- {if (true) throw (RuntimeException)jjte000;}
- }
- {if (true) throw (Error)jjte000;}
+ {if (true) {
+ throw (RuntimeException)jjte000;
+ }}
+ }
+ {if (true) {
+ throw (Error)jjte000;
+ }}
} finally {
if (jjtc000) {
jjtree.closeNodeScope(jjtn000, true);
@@ -483,8 +532,7 @@
ASTInteger jjtn000 = new ASTInteger(JJTINTEGER);
boolean jjtc000 = true;
jjtree.openNodeScope(jjtn000);
- jjtreeOpenNodeScope(jjtn000);int num;
- Token t;
+ jjtreeOpenNodeScope(jjtn000);Token t;
try {
t = jj_consume_token(INTEGER);
jjtree.closeNodeScope(jjtn000, true);
@@ -492,7 +540,9 @@
jjtreeCloseNodeScope(jjtn000);
jjtn000.setValue(Integer.parseInt(t.image));
jjtn000.setPosition(t.beginLine, t.beginColumn);
- {if (true) return t;}
+ {if (true) {
+ return t;
+ }}
} finally {
if (jjtc000) {
jjtree.closeNodeScope(jjtn000, true);
@@ -507,8 +557,7 @@
ASTIdent jjtn000 = new ASTIdent(JJTIDENT);
boolean jjtc000 = true;
jjtree.openNodeScope(jjtn000);
- jjtreeOpenNodeScope(jjtn000);String name;
- Token t;
+ jjtreeOpenNodeScope(jjtn000);Token t;
try {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case TRUE:
@@ -536,7 +585,9 @@
jjtreeCloseNodeScope(jjtn000);
jjtn000.setName(t.image);
jjtn000.setPosition(t.beginLine, t.beginColumn);
- {if (true) return t;}
+ {if (true) {
+ return t;
+ }}
} finally {
if (jjtc000) {
jjtree.closeNodeScope(jjtn000, true);
@@ -563,7 +614,9 @@
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return t.kind;}
+ {if (true) {
+ return t.kind;
+ }}
throw new Error("Missing return statement in function");
}
@@ -587,7 +640,9 @@
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return t.kind;}
+ {if (true) {
+ return t.kind;
+ }}
throw new Error("Missing return statement in function");
}
@@ -617,7 +672,9 @@
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return t.kind;}
+ {if (true) {
+ return t.kind;
+ }}
throw new Error("Missing return statement in function");
}
@@ -635,7 +692,9 @@
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return t.kind;}
+ {if (true) {
+ return t.kind;
+ }}
throw new Error("Missing return statement in function");
}
@@ -647,20 +706,32 @@
}
static final private boolean jj_3R_8() {
- if (jj_scan_token(FALSE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(FALSE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
static final private boolean jj_3R_11() {
- if (jj_scan_token(IDENT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(IDENT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
static final private boolean jj_3R_7() {
- if (jj_scan_token(TRUE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(TRUE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -675,38 +746,70 @@
jj_scanpos = xsp;
if (jj_3R_10()) {
jj_scanpos = xsp;
- if (jj_3R_11()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_11()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
static final private boolean jj_3_1() {
- if (jj_3R_5()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_5()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
static final private boolean jj_3R_5() {
- if (jj_3R_6()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_6()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
static final private boolean jj_3R_10() {
- if (jj_scan_token(WRITE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(WRITE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
static final private boolean jj_3R_9() {
- if (jj_scan_token(READ)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(READ)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -740,8 +843,12 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 17; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+ for (int i = 0; i < 17; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJCalls();
+ }
}
static public void ReInit(java.io.InputStream stream) {
@@ -751,8 +858,12 @@
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 17; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+ for (int i = 0; i < 17; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJCalls();
+ }
}
public MiniParser(java.io.Reader stream) {
@@ -768,8 +879,12 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 17; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+ for (int i = 0; i < 17; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJCalls();
+ }
}
static public void ReInit(java.io.Reader stream) {
@@ -779,8 +894,12 @@
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 17; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+ for (int i = 0; i < 17; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJCalls();
+ }
}
public MiniParser(MiniParserTokenManager tm) {
@@ -795,8 +914,12 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 17; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+ for (int i = 0; i < 17; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJCalls();
+ }
}
public void ReInit(MiniParserTokenManager tm) {
@@ -805,14 +928,21 @@
jj_ntk = -1;
jjtree.reset();
jj_gen = 0;
- for (int i = 0; i < 17; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
+ for (int i = 0; i < 17; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJCalls();
+ }
}
static final private Token jj_consume_token(int kind) throws ParseException {
Token oldToken;
- if ((oldToken = token).next != null) token = token.next;
- else token = token.next = token_source.getNextToken();
+ if ((oldToken = token).next != null) {
+ token = token.next;
+ } else {
+ token = token.next = token_source.getNextToken();
+ }
jj_ntk = -1;
if (token.kind == kind) {
jj_gen++;
@@ -821,7 +951,9 @@
for (int i = 0; i < jj_2_rtns.length; i++) {
JJCalls c = jj_2_rtns[i];
while (c != null) {
- if (c.gen < jj_gen) c.first = null;
+ if (c.gen < jj_gen) {
+ c.first = null;
+ }
c = c.next;
}
}
@@ -847,14 +979,19 @@
if (jj_rescan) {
int i = 0; Token tok = token;
while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
- if (tok != null) jj_add_error_token(kind, i);
+ if (tok != null) {
+ jj_add_error_token(kind, i);
+ }
}
return (jj_scanpos.kind != kind);
}
static final public Token getNextToken() {
- if (token.next != null) token = token.next;
- else token = token.next = token_source.getNextToken();
+ if (token.next != null) {
+ token = token.next;
+ } else {
+ token = token.next = token_source.getNextToken();
+ }
jj_ntk = -1;
jj_gen++;
return token;
@@ -863,17 +1000,21 @@
static final public Token getToken(int index) {
Token t = lookingAhead ? jj_scanpos : token;
for (int i = 0; i < index; i++) {
- if (t.next != null) t = t.next;
- else t = t.next = token_source.getNextToken();
+ if (t.next != null) {
+ t = t.next;
+ } else {
+ t = t.next = token_source.getNextToken();
+ }
}
return t;
}
static final private int jj_ntk() {
- if ((jj_nt=token.next) == null)
- return (jj_ntk = (token.next=token_source.getNextToken()).kind);
- else
- return (jj_ntk = jj_nt.kind);
+ if ((jj_nt=token.next) == null) {
+ return (jj_ntk = (token.next=token_source.getNextToken()).kind);
+ } else {
+ return (jj_ntk = jj_nt.kind);
+ }
}
static private java.util.Vector jj_expentries = new java.util.Vector();
@@ -883,7 +1024,9 @@
static private int jj_endpos;
static private void jj_add_error_token(int kind, int pos) {
- if (pos >= 100) return;
+ if (pos >= 100) {
+ return;
+ }
if (pos == jj_endpos + 1) {
jj_lasttokens[jj_endpos++] = kind;
} else if (jj_endpos != 0) {
@@ -902,11 +1045,17 @@
break;
}
}
- if (exists) break;
+ if (exists) {
+ break;
+ }
}
}
- if (!exists) jj_expentries.addElement(jj_expentry);
- if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
+ if (!exists) {
+ jj_expentries.addElement(jj_expentry);
+ }
+ if (pos != 0) {
+ jj_lasttokens[(jj_endpos = pos) - 1] = kind;
+ }
}
}