From d8b4c8670501420eda0a0fd1fbacba88d89fb5fa Mon Sep 17 00:00:00 2001 From: Tomas Kohout Date: Tue, 15 Dec 2015 23:56:20 +0100 Subject: [PATCH] Moved sources to main --- .../Expressions}/Expressions.cyp | 5 +- {osrc => examples/Float}/Float.cyp | 4 +- {osrc => examples/HeapDirty}/HeapDirty.cyp | 0 {osrc => examples/HeapTenure}/HeapTenure.cyp | 0 {osrc => examples/Overload}/Overload.cyp | 0 {osrc => examples/Overoad2}/Overload2.cyp | 0 {osrc => examples/Prints}/Prints.cyp | 8 +- {osrc => examples}/SATSolver/CNF.cyp | 0 {osrc => examples}/SATSolver/Klauzule.cyp | 0 {osrc => examples}/SATSolver/Ostrava.cyp | 0 {osrc => examples}/SATSolver/Parsovac.cyp | 0 {osrc => examples}/SATSolver/Promenna.cyp | 0 {osrc => examples}/SATSolver/Reseni.cyp | 0 {osrc => examples}/SATSolver/Resic.cyp | 0 osrc/Super2.cyp => examples/Super/Super.cyp | 0 {osrc => examples/While}/While.cyp | 0 osrc/Sample.cyp | 55 --------- osrc/Simple.cyp | 16 --- osrc/Strings.cyp | 23 ---- osrc/Super.cyp | 80 ------------- .../Libraries => ostrajava_lib/src}/Bafr.cyp | 0 .../src}/Bazmek.cyp | 0 .../Libraries => ostrajava_lib/src}/Citac.cyp | 0 .../src}/CysloCele.cyp | 0 .../Libraries => ostrajava_lib/src}/Dryst.cyp | 0 .../src}/Konzola.cyp | 0 .../Libraries => ostrajava_lib/src}/Pole.cyp | 0 resources/sats/05.txt | 111 ++++-------------- resources/sats/07_hard.txt | 91 ++++++++++++++ src/{ => main/java}/JavaTesting/Main.java | 0 .../java}/cz/cvut/fit/ostrajava/Compile.java | 54 ++++++++- .../cz/cvut/fit/ostrajava/Compiler/Break.java | 0 .../cvut/fit/ostrajava/Compiler/ByteCode.java | 0 .../cz/cvut/fit/ostrajava/Compiler/Class.java | 5 +- .../fit/ostrajava/Compiler/Classfile.java | 0 .../ostrajava/Compiler/CompilerException.java | 0 .../fit/ostrajava/Compiler/CompilerTypes.java | 0 .../fit/ostrajava/Compiler/ConstantPool.java | 2 - .../cvut/fit/ostrajava/Compiler/Continue.java | 0 .../cz/cvut/fit/ostrajava/Compiler/Field.java | 0 .../fit/ostrajava/Compiler/Instruction.java | 0 .../ostrajava/Compiler/InstructionSet.java | 0 .../cvut/fit/ostrajava/Compiler/Method.java | 0 .../ostrajava/Compiler/MethodCompilation.java | 0 .../ostrajava/Compiler/OSTRAJavaCompiler.java | 6 +- .../fit/ostrajava/Compiler/TypeException.java | 0 .../cvut/fit/ostrajava/Compiler/Variable.java | 0 .../Interpreter/ByteArrayWrapper.java | 0 .../fit/ostrajava/Interpreter/ClassPool.java | 0 .../fit/ostrajava/Interpreter/Converter.java | 0 .../fit/ostrajava/Interpreter/Debugger.java | 0 .../cvut/fit/ostrajava/Interpreter/Frame.java | 0 .../ostrajava/Interpreter/Instructions.java | 0 .../Interpreter/InterpretedClass.java | 0 .../Interpreter/InterpretedMethod.java | 0 .../Interpreter/InterpreterException.java | 1 - .../Interpreter/LookupException.java | 0 .../ostrajava/Interpreter/Memory/Array.java | 0 .../Interpreter/Memory/DirtyLink.java | 0 .../GarbageCollector/GarbageCollector.java | 0 .../GarbageCollector/GenerationCollector.java | 0 .../MarkAndSweepCollector.java | 0 .../Memory/GarbageCollector/State.java | 0 .../Interpreter/Memory/GenerationHeap.java | 1 - .../ostrajava/Interpreter/Memory/Heap.java | 0 .../Interpreter/Memory/HeapItem.java | 0 .../Interpreter/Memory/HeapOverflow.java | 0 .../ostrajava/Interpreter/Memory/Object.java | 0 .../Interpreter/Memory/SimpleHeap.java | 0 .../Interpreter/Natives/Array/ArraySize.java | 0 .../Natives/Array/CharArraySize.java | 0 .../Natives/Array/IntArraySize.java | 0 .../Natives/Array/ReferenceArraySize.java | 0 .../Natives/Conversion/CharArrayToInt.java | 1 + .../Natives/Conversion/IntToCharArray.java | 0 .../Natives/IO/Console/PrintBool.java | 0 .../Natives/IO/Console/PrintChar.java | 0 .../Natives/IO/Console/PrintChars.java | 0 .../Natives/IO/Console/PrintFloat.java | 0 .../Natives/IO/Console/PrintInt.java | 0 .../Natives/IO/File/CloseReader.java | 0 .../Natives/IO/File/OpenReader.java | 0 .../Interpreter/Natives/IO/File/ReadLine.java | 0 .../Interpreter/Natives/IO/File/Readers.java | 0 .../Interpreter/Natives/Math/LogInt.java | 0 .../Interpreter/Natives/Math/PowInt.java | 0 .../ostrajava/Interpreter/Natives/Native.java | 0 .../Interpreter/Natives/Natives.java | 0 .../Interpreter/OSTRAJavaInterpreter.java | 2 + .../cvut/fit/ostrajava/Interpreter/Stack.java | 0 .../fit/ostrajava/Interpreter/StackValue.java | 0 .../java}/cz/cvut/fit/ostrajava/Main.java | 0 .../Parser/ASTAdditiveExpression.java | 0 .../Parser/ASTAllocationExpression.java | 0 .../fit/ostrajava/Parser/ASTAndOperator.java | 0 .../fit/ostrajava/Parser/ASTArgumentList.java | 0 .../fit/ostrajava/Parser/ASTArguments.java | 0 .../ostrajava/Parser/ASTArrayDimensions.java | 0 .../fit/ostrajava/Parser/ASTArraySuffix.java | 0 .../fit/ostrajava/Parser/ASTArrayType.java | 0 .../fit/ostrajava/Parser/ASTAssignee.java | 0 .../ostrajava/Parser/ASTAssigneePrefix.java | 0 .../ostrajava/Parser/ASTAssigneeSuffix.java | 0 .../fit/ostrajava/Parser/ASTAssignment.java | 0 .../Parser/ASTAssignmentOperator.java | 0 .../cvut/fit/ostrajava/Parser/ASTBlock.java | 0 .../ostrajava/Parser/ASTBlockStatement.java | 0 .../cz/cvut/fit/ostrajava/Parser/ASTBool.java | 0 .../ostrajava/Parser/ASTBreakStatement.java | 0 .../cz/cvut/fit/ostrajava/Parser/ASTChar.java | 0 .../fit/ostrajava/Parser/ASTCharLiteral.java | 0 .../cvut/fit/ostrajava/Parser/ASTClass.java | 0 .../Parser/ASTClassBodyDeclaration.java | 0 .../ostrajava/Parser/ASTClassDeclaration.java | 0 .../ostrajava/Parser/ASTCompilationUnit.java | 0 .../Parser/ASTConditionalAndExpression.java | 0 .../Parser/ASTConditionalExpression.java | 0 .../Parser/ASTConditionalOrExpression.java | 0 .../Parser/ASTConstructorDeclaration.java | 0 .../Parser/ASTContinueStatement.java | 0 .../ostrajava/Parser/ASTDebugStatement.java | 0 .../ostrajava/Parser/ASTDivideOperator.java | 0 .../fit/ostrajava/Parser/ASTDoStatement.java | 0 .../ostrajava/Parser/ASTEmptyStatement.java | 0 .../ostrajava/Parser/ASTEqualOperator.java | 0 .../Parser/ASTEqualityExpression.java | 0 .../ASTExplicitConstructorInvocation.java | 0 .../fit/ostrajava/Parser/ASTExpression.java | 0 .../cvut/fit/ostrajava/Parser/ASTFalse.java | 0 .../ostrajava/Parser/ASTFieldDeclaration.java | 0 .../cvut/fit/ostrajava/Parser/ASTFloat.java | 0 .../fit/ostrajava/Parser/ASTFloatLiteral.java | 0 .../cvut/fit/ostrajava/Parser/ASTForInit.java | 0 .../fit/ostrajava/Parser/ASTForStatement.java | 0 .../fit/ostrajava/Parser/ASTForUpdate.java | 0 .../ostrajava/Parser/ASTFormalParameter.java | 0 .../ostrajava/Parser/ASTFormalParameters.java | 0 .../Parser/ASTGreaterThanOperator.java | 0 .../Parser/ASTGreaterThanOrEqualOperator.java | 0 .../fit/ostrajava/Parser/ASTIfStatement.java | 0 .../Parser/ASTInstanceOfExpression.java | 0 .../ostrajava/Parser/ASTLessThanOperator.java | 0 .../Parser/ASTLessThanOrEqualOperator.java | 0 .../cvut/fit/ostrajava/Parser/ASTLiteral.java | 0 .../Parser/ASTLocalVariableDeclaration.java | 0 .../cvut/fit/ostrajava/Parser/ASTMethod.java | 0 .../Parser/ASTMethodDeclaration.java | 0 .../Parser/ASTMethodDeclarationLookahead.java | 0 .../ostrajava/Parser/ASTMethodDeclarator.java | 0 .../ostrajava/Parser/ASTMinusOperator.java | 0 .../ostrajava/Parser/ASTModuloOperator.java | 0 .../Parser/ASTMultiplicativeExpression.java | 0 .../ostrajava/Parser/ASTMultiplyOperator.java | 0 .../cz/cvut/fit/ostrajava/Parser/ASTName.java | 0 .../fit/ostrajava/Parser/ASTNameList.java | 0 .../cvut/fit/ostrajava/Parser/ASTNative.java | 0 .../ostrajava/Parser/ASTNegationOperator.java | 0 .../ostrajava/Parser/ASTNotEqualOperator.java | 0 .../fit/ostrajava/Parser/ASTNullLiteral.java | 0 .../cvut/fit/ostrajava/Parser/ASTNumber.java | 0 .../ostrajava/Parser/ASTNumberLiteral.java | 0 .../fit/ostrajava/Parser/ASTNumberValue.java | 0 .../fit/ostrajava/Parser/ASTOrOperator.java | 0 .../fit/ostrajava/Parser/ASTPlusOperator.java | 0 .../Parser/ASTPrimaryExpression.java | 0 .../ostrajava/Parser/ASTPrimaryPrefix.java | 0 .../ostrajava/Parser/ASTPrimarySuffix.java | 0 .../fit/ostrajava/Parser/ASTPrimitive.java | 0 .../ostrajava/Parser/ASTPrintStatement.java | 0 .../Parser/ASTRelationalExpression.java | 0 .../fit/ostrajava/Parser/ASTResultType.java | 0 .../ostrajava/Parser/ASTReturnStatement.java | 0 .../fit/ostrajava/Parser/ASTStatement.java | 0 .../Parser/ASTStatementExpression.java | 0 .../Parser/ASTStatementExpressionList.java | 0 .../cvut/fit/ostrajava/Parser/ASTStatic.java | 0 .../cvut/fit/ostrajava/Parser/ASTString.java | 0 .../ostrajava/Parser/ASTStringLiteral.java | 0 .../cvut/fit/ostrajava/Parser/ASTSuper.java | 0 .../fit/ostrajava/Parser/ASTSwitchLabel.java | 0 .../ostrajava/Parser/ASTSwitchStatement.java | 0 .../cz/cvut/fit/ostrajava/Parser/ASTThis.java | 0 .../ostrajava/Parser/ASTThrowStatement.java | 0 .../cz/cvut/fit/ostrajava/Parser/ASTTrue.java | 0 .../fit/ostrajava/Parser/ASTTryStatement.java | 0 .../cz/cvut/fit/ostrajava/Parser/ASTType.java | 0 .../ostrajava/Parser/ASTTypeDeclaration.java | 0 .../ostrajava/Parser/ASTUnaryExpression.java | 0 .../ASTUnaryExpressionNotPlusMinus.java | 0 .../fit/ostrajava/Parser/ASTVariable.java | 0 .../Parser/ASTVariableDeclarator.java | 0 .../Parser/ASTVariableInitializer.java | 0 .../ostrajava/Parser/ASTWhileStatement.java | 0 .../Parser/JJTOSTRAJavaParserState.java | 0 .../fit/ostrajava/Parser/JavaCharStream.java | 0 .../cz/cvut/fit/ostrajava/Parser/Node.java | 0 .../cz/cvut/fit/ostrajava/Parser/OSTRAJava.jj | 0 .../cvut/fit/ostrajava/Parser/OSTRAJava.jjt | 0 .../fit/ostrajava/Parser/OSTRAJavaParser.java | 0 .../Parser/OSTRAJavaParserConstants.java | 0 .../Parser/OSTRAJavaParserTokenManager.java | 0 .../Parser/OSTRAJavaParserTreeConstants.java | 0 .../fit/ostrajava/Parser/ParseException.java | 0 .../cvut/fit/ostrajava/Parser/SimpleNode.java | 0 .../cz/cvut/fit/ostrajava/Parser/Token.java | 0 .../fit/ostrajava/Parser/TokenMgrError.java | 0 .../java}/cz/cvut/fit/ostrajava/Run.java | 9 ++ .../cz/cvut/fit/ostrajava/Type/ArrayType.java | 0 .../cvut/fit/ostrajava/Type/BooleanType.java | 0 .../cz/cvut/fit/ostrajava/Type/CharType.java | 0 .../cz/cvut/fit/ostrajava/Type/FloatType.java | 0 .../cvut/fit/ostrajava/Type/NumberType.java | 0 .../fit/ostrajava/Type/ReferenceType.java | 0 .../cvut/fit/ostrajava/Type/StringType.java | 0 .../cz/cvut/fit/ostrajava/Type/Type.java | 0 .../cz/cvut/fit/ostrajava/Type/Types.java | 0 .../cz/cvut/fit/ostrajava/Type/VoidType.java | 0 .../Compiler/OSTRAJavaCompilerTest.java | 102 ---------------- 218 files changed, 182 insertions(+), 394 deletions(-) rename {osrc => examples/Expressions}/Expressions.cyp (80%) rename {osrc => examples/Float}/Float.cyp (76%) rename {osrc => examples/HeapDirty}/HeapDirty.cyp (100%) rename {osrc => examples/HeapTenure}/HeapTenure.cyp (100%) rename {osrc => examples/Overload}/Overload.cyp (100%) rename {osrc => examples/Overoad2}/Overload2.cyp (100%) rename {osrc => examples/Prints}/Prints.cyp (74%) rename {osrc => examples}/SATSolver/CNF.cyp (100%) rename {osrc => examples}/SATSolver/Klauzule.cyp (100%) rename {osrc => examples}/SATSolver/Ostrava.cyp (100%) rename {osrc => examples}/SATSolver/Parsovac.cyp (100%) rename {osrc => examples}/SATSolver/Promenna.cyp (100%) rename {osrc => examples}/SATSolver/Reseni.cyp (100%) rename {osrc => examples}/SATSolver/Resic.cyp (100%) rename osrc/Super2.cyp => examples/Super/Super.cyp (100%) rename {osrc => examples/While}/While.cyp (100%) delete mode 100644 osrc/Sample.cyp delete mode 100644 osrc/Simple.cyp delete mode 100644 osrc/Strings.cyp delete mode 100644 osrc/Super.cyp rename {osrc/Libraries => ostrajava_lib/src}/Bafr.cyp (100%) rename {osrc/Libraries => ostrajava_lib/src}/Bazmek.cyp (100%) rename {osrc/Libraries => ostrajava_lib/src}/Citac.cyp (100%) rename {osrc/Libraries => ostrajava_lib/src}/CysloCele.cyp (100%) rename {osrc/Libraries => ostrajava_lib/src}/Dryst.cyp (100%) rename {osrc/Libraries => ostrajava_lib/src}/Konzola.cyp (100%) rename {osrc/Libraries => ostrajava_lib/src}/Pole.cyp (100%) create mode 100644 resources/sats/07_hard.txt rename src/{ => main/java}/JavaTesting/Main.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compile.java (72%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/Break.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/ByteCode.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/Class.java (96%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/Classfile.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/CompilerException.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/CompilerTypes.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/ConstantPool.java (95%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/Continue.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/Field.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/Instruction.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/InstructionSet.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/Method.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/MethodCompilation.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/OSTRAJavaCompiler.java (99%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/TypeException.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Compiler/Variable.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/ByteArrayWrapper.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/ClassPool.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Converter.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Debugger.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Frame.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Instructions.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/InterpretedClass.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/InterpretedMethod.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/InterpreterException.java (81%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/LookupException.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/Array.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/DirtyLink.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/GarbageCollector.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/GenerationCollector.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/MarkAndSweepCollector.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/State.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/GenerationHeap.java (98%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/Heap.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/HeapItem.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/HeapOverflow.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/Object.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Memory/SimpleHeap.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/ArraySize.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/CharArraySize.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/IntArraySize.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/ReferenceArraySize.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/CharArrayToInt.java (99%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/IntToCharArray.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintBool.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintChar.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintChars.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintFloat.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintInt.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/CloseReader.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/OpenReader.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/ReadLine.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/Readers.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/Math/LogInt.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/Math/PowInt.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/Native.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Natives/Natives.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/OSTRAJavaInterpreter.java (99%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/Stack.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Interpreter/StackValue.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Main.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTAdditiveExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTAllocationExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTAndOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTArgumentList.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTArguments.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTArrayDimensions.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTArraySuffix.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTArrayType.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTAssignee.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTAssigneePrefix.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTAssigneeSuffix.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTAssignment.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTAssignmentOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTBlock.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTBlockStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTBool.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTBreakStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTChar.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTCharLiteral.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTClass.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTClassBodyDeclaration.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTClassDeclaration.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTCompilationUnit.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTConditionalAndExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTConditionalExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTConditionalOrExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTConstructorDeclaration.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTContinueStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTDebugStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTDivideOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTDoStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTEmptyStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTEqualOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTEqualityExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTExplicitConstructorInvocation.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTFalse.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTFieldDeclaration.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTFloat.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTFloatLiteral.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTForInit.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTForStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTForUpdate.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTFormalParameter.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTFormalParameters.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTGreaterThanOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTGreaterThanOrEqualOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTIfStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTInstanceOfExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTLessThanOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTLessThanOrEqualOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTLiteral.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTLocalVariableDeclaration.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTMethod.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclaration.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclarationLookahead.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclarator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTMinusOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTModuloOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTMultiplicativeExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTMultiplyOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTName.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTNameList.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTNative.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTNegationOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTNotEqualOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTNullLiteral.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTNumber.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTNumberLiteral.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTNumberValue.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTOrOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTPlusOperator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTPrimaryExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTPrimaryPrefix.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTPrimarySuffix.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTPrimitive.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTPrintStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTRelationalExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTResultType.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTReturnStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTStatementExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTStatementExpressionList.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTStatic.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTString.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTStringLiteral.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTSuper.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTSwitchLabel.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTSwitchStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTThis.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTThrowStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTTrue.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTTryStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTType.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTTypeDeclaration.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTUnaryExpression.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTUnaryExpressionNotPlusMinus.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTVariable.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTVariableDeclarator.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTVariableInitializer.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ASTWhileStatement.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/JJTOSTRAJavaParserState.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/JavaCharStream.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/Node.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jj (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jjt (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParser.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserConstants.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserTokenManager.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserTreeConstants.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/ParseException.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/SimpleNode.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/Token.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Parser/TokenMgrError.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Run.java (92%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Type/ArrayType.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Type/BooleanType.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Type/CharType.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Type/FloatType.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Type/NumberType.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Type/ReferenceType.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Type/StringType.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Type/Type.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Type/Types.java (100%) rename src/{ => main/java}/cz/cvut/fit/ostrajava/Type/VoidType.java (100%) delete mode 100644 tests/cz/cvut/fit/ostrajava/Compiler/OSTRAJavaCompilerTest.java diff --git a/osrc/Expressions.cyp b/examples/Expressions/Expressions.cyp similarity index 80% rename from osrc/Expressions.cyp rename to examples/Expressions/Expressions.cyp index de03423..d536ae7 100644 --- a/osrc/Expressions.cyp +++ b/examples/Expressions/Expressions.cyp @@ -4,7 +4,7 @@ tryda Ostrava { toz number foo pyco toz C boo pyco - fraj rynek(number arg1, string arg2, D arg3){ + rynek(){ toz number i, j pyco @@ -26,9 +26,6 @@ tryda Ostrava { davaj pyco } - number dalsi(){ - toz number takhle pyco - } } fajront pyco \ No newline at end of file diff --git a/osrc/Float.cyp b/examples/Float/Float.cyp similarity index 76% rename from osrc/Float.cyp rename to examples/Float/Float.cyp index f6d1c49..07ca44d 100644 --- a/osrc/Float.cyp +++ b/examples/Float/Float.cyp @@ -7,9 +7,9 @@ banik pyco tryda Ostrava { rynek(){ toz cyslo_desetinne f pyco - f = 0.1001 - 0.2002 pyco + f = 0.74001 - 0.2002 pyco Konzola.pravit(f) pyco - dechrobok pyco + } } diff --git a/osrc/HeapDirty.cyp b/examples/HeapDirty/HeapDirty.cyp similarity index 100% rename from osrc/HeapDirty.cyp rename to examples/HeapDirty/HeapDirty.cyp diff --git a/osrc/HeapTenure.cyp b/examples/HeapTenure/HeapTenure.cyp similarity index 100% rename from osrc/HeapTenure.cyp rename to examples/HeapTenure/HeapTenure.cyp diff --git a/osrc/Overload.cyp b/examples/Overload/Overload.cyp similarity index 100% rename from osrc/Overload.cyp rename to examples/Overload/Overload.cyp diff --git a/osrc/Overload2.cyp b/examples/Overoad2/Overload2.cyp similarity index 100% rename from osrc/Overload2.cyp rename to examples/Overoad2/Overload2.cyp diff --git a/osrc/Prints.cyp b/examples/Prints/Prints.cyp similarity index 74% rename from osrc/Prints.cyp rename to examples/Prints/Prints.cyp index 4f4d24d..fd08131 100644 --- a/osrc/Prints.cyp +++ b/examples/Prints/Prints.cyp @@ -8,8 +8,7 @@ tryda A { } Dryst naDryst(){ - toz cyslo c = joch.c pyco - toz CysloCele cele = zrob CysloCele(c) pyco + toz CysloCele cele = zrob CysloCele(joch.c) pyco davaj cele.naDryst() pyco } } @@ -24,16 +23,11 @@ tryda Ostrava{ toz A a = zrob A(1020) pyco Konzola.pravit(a) pyco - - Konzola.pravit(d) pyco - d = chuj pyco Konzola.pravit(d) pyco Konzola.pravit(i) pyco Konzola.pravit(c) pyco Konzola.pravit(b) pyco - - dechrobok pyco } } diff --git a/osrc/SATSolver/CNF.cyp b/examples/SATSolver/CNF.cyp similarity index 100% rename from osrc/SATSolver/CNF.cyp rename to examples/SATSolver/CNF.cyp diff --git a/osrc/SATSolver/Klauzule.cyp b/examples/SATSolver/Klauzule.cyp similarity index 100% rename from osrc/SATSolver/Klauzule.cyp rename to examples/SATSolver/Klauzule.cyp diff --git a/osrc/SATSolver/Ostrava.cyp b/examples/SATSolver/Ostrava.cyp similarity index 100% rename from osrc/SATSolver/Ostrava.cyp rename to examples/SATSolver/Ostrava.cyp diff --git a/osrc/SATSolver/Parsovac.cyp b/examples/SATSolver/Parsovac.cyp similarity index 100% rename from osrc/SATSolver/Parsovac.cyp rename to examples/SATSolver/Parsovac.cyp diff --git a/osrc/SATSolver/Promenna.cyp b/examples/SATSolver/Promenna.cyp similarity index 100% rename from osrc/SATSolver/Promenna.cyp rename to examples/SATSolver/Promenna.cyp diff --git a/osrc/SATSolver/Reseni.cyp b/examples/SATSolver/Reseni.cyp similarity index 100% rename from osrc/SATSolver/Reseni.cyp rename to examples/SATSolver/Reseni.cyp diff --git a/osrc/SATSolver/Resic.cyp b/examples/SATSolver/Resic.cyp similarity index 100% rename from osrc/SATSolver/Resic.cyp rename to examples/SATSolver/Resic.cyp diff --git a/osrc/Super2.cyp b/examples/Super/Super.cyp similarity index 100% rename from osrc/Super2.cyp rename to examples/Super/Super.cyp diff --git a/osrc/While.cyp b/examples/While/While.cyp similarity index 100% rename from osrc/While.cyp rename to examples/While/While.cyp diff --git a/osrc/Sample.cyp b/osrc/Sample.cyp deleted file mode 100644 index 2c43200..0000000 --- a/osrc/Sample.cyp +++ /dev/null @@ -1,55 +0,0 @@ -banik pyco - -tryda Kocka fagan od Zvire { - - toz string jmeno, rasa pyco - toz number delka_chlupu pyco - - - number udelejKotrmelec(number kolikrat) muze mrdnut Cypovina - { - - toz number i pyco - - kaj (neco > 0 bo tamto <= 1 aj tadyto == 1){ - - } kajtez (tamto == 4) { - - } boinak { - - } - - i = k + j pyco - - r = k bo l pyco - - - - toz number i = kolikrat pyco - - dokavad (i > 0){ - joch.udelejKotrmelec() pyco - } - - - pravit "Super" pyco - - lajsnut { - toz string vysledek = nejakaMetoda() pyco - kaj (vysledek == chuj){ - mrdnut zrob Cypovina("Stala se chyba") pyco - } - } lapnut (Cypovina c){ - pravit c pyco - } fertyk { - pravit "Pecka" pyco - } - - davaj i pyco - } -} - - -toz Kocka kocka = zrob Kocka() pyco - -fajront pyco \ No newline at end of file diff --git a/osrc/Simple.cyp b/osrc/Simple.cyp deleted file mode 100644 index bdce952..0000000 --- a/osrc/Simple.cyp +++ /dev/null @@ -1,16 +0,0 @@ -banik pyco - -tryda Ostrava { - - rynek(){ - toz cyslo a = 5 pyco - toz cyslo b = pocitaj(a, 4) pyco - } - - cyslo pocitaj(cyslo a, cyslo b){ - davaj a - b pyco - } - -} - -fajront pyco \ No newline at end of file diff --git a/osrc/Strings.cyp b/osrc/Strings.cyp deleted file mode 100644 index 1c704b8..0000000 --- a/osrc/Strings.cyp +++ /dev/null @@ -1,23 +0,0 @@ -banik pyco - - -tryda Ostrava{ - - rynek(){ - toz Dryst d = "Cokoliv" pyco - - toz chachar[] p = zrob chachar[10] pyco - - toz Dryst e pyco - e = zrob Dryst(p) pyco - - Konzola.pravit(d) pyco - - Konzola.pravit("Neco inciho") pyco - - dechrobok pyco - } - -} - -fajront pyco \ No newline at end of file diff --git a/osrc/Super.cyp b/osrc/Super.cyp deleted file mode 100644 index 8187fe5..0000000 --- a/osrc/Super.cyp +++ /dev/null @@ -1,80 +0,0 @@ -banik pyco - -tryda Ostrava { - - rynek(){ - toz A a pyco - toz B b pyco - toz X x pyco - toz Y y pyco - toz Z z pyco - toz cyslo neco = 15 pyco - - Konzola.pravit(neco) pyco - - a = zrob A() pyco - b = zrob B() pyco - - x = zrob X() pyco - z = zrob Z() pyco - - dechrobok pyco - - a.foo(x, z) pyco - b.foo(x, z) pyco - } - -} - -tryda X { - print() { - Konzola.pravit(" I'm X") pyco - } -} - -tryda Y { - print() { - Konzola.pravit(" I'm Y") pyco - } -} - -tryda Z fagan od Y { - print() { - Konzola.pravit(" I'm Z") pyco - } -} - - -tryda A { - A(){ - Konzola.pravit("A:construct") pyco - } - - A(cyslo i){ - Konzola.pravit("A:construct(") pyco - Konzola.pravit(i) pyco - Konzola.pravit(")") pyco - } - - foo(X x, Z z) { - Konzola.pravit("In A::foo(X,Z)") pyco - x.print() pyco - z.print() pyco - } -} - -tryda B fagan od A { - - foo(X x, Z z) { - Konzola.pravit("In B::foo(X,Z)") pyco - x.print() pyco - z.print() pyco - - forant.foo(x,z) pyco - } -} - - - - -fajront pyco \ No newline at end of file diff --git a/osrc/Libraries/Bafr.cyp b/ostrajava_lib/src/Bafr.cyp similarity index 100% rename from osrc/Libraries/Bafr.cyp rename to ostrajava_lib/src/Bafr.cyp diff --git a/osrc/Libraries/Bazmek.cyp b/ostrajava_lib/src/Bazmek.cyp similarity index 100% rename from osrc/Libraries/Bazmek.cyp rename to ostrajava_lib/src/Bazmek.cyp diff --git a/osrc/Libraries/Citac.cyp b/ostrajava_lib/src/Citac.cyp similarity index 100% rename from osrc/Libraries/Citac.cyp rename to ostrajava_lib/src/Citac.cyp diff --git a/osrc/Libraries/CysloCele.cyp b/ostrajava_lib/src/CysloCele.cyp similarity index 100% rename from osrc/Libraries/CysloCele.cyp rename to ostrajava_lib/src/CysloCele.cyp diff --git a/osrc/Libraries/Dryst.cyp b/ostrajava_lib/src/Dryst.cyp similarity index 100% rename from osrc/Libraries/Dryst.cyp rename to ostrajava_lib/src/Dryst.cyp diff --git a/osrc/Libraries/Konzola.cyp b/ostrajava_lib/src/Konzola.cyp similarity index 100% rename from osrc/Libraries/Konzola.cyp rename to ostrajava_lib/src/Konzola.cyp diff --git a/osrc/Libraries/Pole.cyp b/ostrajava_lib/src/Pole.cyp similarity index 100% rename from osrc/Libraries/Pole.cyp rename to ostrajava_lib/src/Pole.cyp diff --git a/resources/sats/05.txt b/resources/sats/05.txt index 4fa3915..acc3501 100644 --- a/resources/sats/05.txt +++ b/resources/sats/05.txt @@ -1,92 +1,21 @@ -c FILE: aim-50-1_6-yes1-4.cnf +c quinn.cnf c -c SOURCE: Kazuo Iwama, Eiji Miyano (miyano@cscu.kyushu-u.ac.jp), -c and Yuichi Asahiro -c -c DESCRIPTION: Artifical instances from generator by source. Generators -c and more information in sat/contributed/iwama. -c -c NOTE: Satisfiable -c -c 01000100011001110111011110000001001100110111011001 -p cnf 50 80 -16 17 30 0 --17 22 30 0 --17 -22 30 0 -16 -30 47 0 -16 -30 -47 0 --16 -21 31 0 --16 -21 -31 0 --16 21 -28 0 --13 21 28 0 -13 -16 18 0 -13 -18 -38 0 -13 -18 -31 0 -31 38 44 0 --8 31 -44 0 -8 -12 -44 0 -8 12 -27 0 -12 27 40 0 --4 27 -40 0 -12 23 -40 0 --3 4 -23 0 -3 -23 -49 0 -3 -13 -49 0 --23 -26 49 0 -12 -34 49 0 --12 26 -34 0 -19 34 36 0 --19 26 36 0 --30 34 -36 0 -24 34 -36 0 --24 -36 43 0 -6 42 -43 0 --24 42 -43 0 --5 -24 -42 0 -5 20 -42 0 -5 -7 -20 0 -4 7 10 0 --4 10 -20 0 -7 -10 -41 0 --10 41 46 0 --33 41 -46 0 -33 -37 -46 0 -32 33 37 0 -6 -32 37 0 --6 25 -32 0 --6 -25 -48 0 --9 28 48 0 --9 -25 -28 0 -19 -25 48 0 -2 9 -19 0 --2 -19 35 0 --2 22 -35 0 --22 -35 50 0 --17 -35 -50 0 --29 -35 -50 0 --1 29 -50 0 -1 11 29 0 --11 17 -45 0 --11 39 45 0 --26 39 45 0 --3 -26 45 0 --11 15 -39 0 -14 -15 -39 0 -14 -15 -45 0 -14 -15 -27 0 --14 -15 47 0 -17 17 40 0 -1 -29 -31 0 --7 32 38 0 --14 -33 -47 0 --1 2 -8 0 -35 43 44 0 -21 21 24 0 -20 29 -48 0 -23 35 -37 0 -2 18 -33 0 -15 25 -45 0 -9 14 -38 0 --5 11 50 0 --3 -13 46 0 --13 -41 43 0 +p cnf 16 18 +1 2 0 +-2 -4 0 +3 4 0 +-4 -5 0 +5 -6 0 +6 -7 0 +6 7 0 +7 -16 0 +8 -9 0 +-8 -14 0 +9 10 0 +9 -10 0 +-10 -11 0 +10 12 0 +11 12 0 +13 14 0 +14 -15 0 +15 16 0 \ No newline at end of file diff --git a/resources/sats/07_hard.txt b/resources/sats/07_hard.txt new file mode 100644 index 0000000..63321e0 --- /dev/null +++ b/resources/sats/07_hard.txt @@ -0,0 +1,91 @@ +c FILE: aim-50-1_6-yes1-4.cnf +c +c SOURCE: Kazuo Iwama, Eiji Miyano (miyano@cscu.kyushu-u.ac.jp), +c and Yuichi Asahiro +c +c DESCRIPTION: Artifical instances from generator by source. Generators +c and more information in sat/contributed/iwama. +c +c NOTE: Satisfiable +c +p cnf 50 80 +16 17 30 0 +-17 22 30 0 +-17 -22 30 0 +16 -30 47 0 +16 -30 -47 0 +-16 -21 31 0 +-16 -21 -31 0 +-16 21 -28 0 +-13 21 28 0 +13 -16 18 0 +13 -18 -38 0 +13 -18 -31 0 +31 38 44 0 +-8 31 -44 0 +8 -12 -44 0 +8 12 -27 0 +12 27 40 0 +-4 27 -40 0 +12 23 -40 0 +-3 4 -23 0 +3 -23 -49 0 +3 -13 -49 0 +-23 -26 49 0 +12 -34 49 0 +-12 26 -34 0 +19 34 36 0 +-19 26 36 0 +-30 34 -36 0 +24 34 -36 0 +-24 -36 43 0 +6 42 -43 0 +-24 42 -43 0 +-5 -24 -42 0 +5 20 -42 0 +5 -7 -20 0 +4 7 10 0 +-4 10 -20 0 +7 -10 -41 0 +-10 41 46 0 +-33 41 -46 0 +33 -37 -46 0 +32 33 37 0 +6 -32 37 0 +-6 25 -32 0 +-6 -25 -48 0 +-9 28 48 0 +-9 -25 -28 0 +19 -25 48 0 +2 9 -19 0 +-2 -19 35 0 +-2 22 -35 0 +-22 -35 50 0 +-17 -35 -50 0 +-29 -35 -50 0 +-1 29 -50 0 +1 11 29 0 +-11 17 -45 0 +-11 39 45 0 +-26 39 45 0 +-3 -26 45 0 +-11 15 -39 0 +14 -15 -39 0 +14 -15 -45 0 +14 -15 -27 0 +-14 -15 47 0 +17 17 40 0 +1 -29 -31 0 +-7 32 38 0 +-14 -33 -47 0 +-1 2 -8 0 +35 43 44 0 +21 21 24 0 +20 29 -48 0 +23 35 -37 0 +2 18 -33 0 +15 25 -45 0 +9 14 -38 0 +-5 11 50 0 +-3 -13 46 0 +-13 -41 43 0 diff --git a/src/JavaTesting/Main.java b/src/main/java/JavaTesting/Main.java similarity index 100% rename from src/JavaTesting/Main.java rename to src/main/java/JavaTesting/Main.java diff --git a/src/cz/cvut/fit/ostrajava/Compile.java b/src/main/java/cz/cvut/fit/ostrajava/Compile.java similarity index 72% rename from src/cz/cvut/fit/ostrajava/Compile.java rename to src/main/java/cz/cvut/fit/ostrajava/Compile.java index d4a1ff4..8958fc3 100644 --- a/src/cz/cvut/fit/ostrajava/Compile.java +++ b/src/main/java/cz/cvut/fit/ostrajava/Compile.java @@ -15,12 +15,16 @@ import java.io.*; import java.util.ArrayList; import java.util.Arrays; +import java.util.Iterator; import java.util.List; import cz.cvut.fit.ostrajava.Compiler.Class; public class Compile { + public final static String COMPILED_LIBRARIES_DIRECTORY = "ostrajava_lib/out/"; + public final static String SOURCE_LIBRARIES_DIRECTORY = "ostrajava_lib/src/"; + final static String CLASS_TYPE_EXTENSION = "tryda"; public static void printHelp(){ @@ -29,6 +33,8 @@ public static void printHelp(){ "-d slozka pro vygenerovane .tryda soubory \n"); } + + public static void exec(String[] args) throws Exception { if (args.length == 0) { @@ -37,7 +43,7 @@ public static void exec(String[] args) throws Exception } List filenames = new ArrayList<>(Arrays.asList(args)); - String outputDirectory = "."; + String outputDirectory = "./"; for (int i = 0; i < args.length-1; i ++) { String param = args[i]; @@ -50,22 +56,28 @@ public static void exec(String[] args) throws Exception } } + + if (filenames.size() == 0){ printHelp(); System.exit(0); } + //Add all libraries for type control (sources) + filenames.add(SOURCE_LIBRARIES_DIRECTORY); List rootNodeList = parse(filenames); List classList = new ArrayList<>(); OSTRAJavaCompiler compiler = new OSTRAJavaCompiler(); + //First stage - precompilation for (Node node: rootNodeList){ classList.addAll(compiler.precompile(node)); } + //Second stage - compilation ClassPool classPool = new ClassPool(classList); @@ -75,11 +87,22 @@ public static void exec(String[] args) throws Exception classList.addAll(compiler.compile(node, classPool)); } + //We don't want the libraries to be generated again + classList = removeLibraries(classList); + + + //Create output directory + File outputDir = new File(outputDirectory); + if (!outputDir.exists()) { + outputDir.mkdirs(); + } + + //Clean the directory removeClassfiles(outputDirectory); //Generate files for (Class clazz: classList){ - Classfile.toFile(clazz, outputDirectory + clazz.getClassName() + "." + CLASS_TYPE_EXTENSION); + Classfile.toFile(clazz, outputDir.getAbsolutePath() + "/" + clazz.getClassName() + "." + CLASS_TYPE_EXTENSION); } @@ -167,5 +190,32 @@ protected static List parse(List filenames) throws FileNotFoundExc return rootNodeList; } + public static List removeLibraries(List classList) throws IOException { + + File directory = new File(COMPILED_LIBRARIES_DIRECTORY); + File[] dirFiles = directory.listFiles(); + for (File dirFile: dirFiles){ + String extension = ""; + + int i = dirFile.getName().lastIndexOf('.'); + if (i > 0) { + extension = dirFile.getName().substring(i + 1); + } + + if (extension.equals(Compile.CLASS_TYPE_EXTENSION)) { + Class library = Classfile.fromFile(dirFile); + + for (Iterator iter = classList.iterator(); iter.hasNext(); ) { + Class clazz = iter.next(); + if (clazz.getClassName().equals(library.getClassName())) { + iter.remove(); + } + } + } + } + + return classList; + } + } diff --git a/src/cz/cvut/fit/ostrajava/Compiler/Break.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/Break.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/Break.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/Break.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/ByteCode.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/ByteCode.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/ByteCode.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/ByteCode.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/Class.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/Class.java similarity index 96% rename from src/cz/cvut/fit/ostrajava/Compiler/Class.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/Class.java index e8c9474..790c1e2 100644 --- a/src/cz/cvut/fit/ostrajava/Compiler/Class.java +++ b/src/main/java/cz/cvut/fit/ostrajava/Compiler/Class.java @@ -1,11 +1,8 @@ package cz.cvut.fit.ostrajava.Compiler; -import com.sun.javaws.exceptions.InvalidArgumentException; -import com.sun.tools.corba.se.idl.InvalidArgument; + import cz.cvut.fit.ostrajava.Interpreter.ClassPool; -import cz.cvut.fit.ostrajava.Interpreter.InterpretedMethod; import cz.cvut.fit.ostrajava.Interpreter.LookupException; -import cz.cvut.fit.ostrajava.Type.ReferenceType; import cz.cvut.fit.ostrajava.Type.Type; import cz.cvut.fit.ostrajava.Type.Types; diff --git a/src/cz/cvut/fit/ostrajava/Compiler/Classfile.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/Classfile.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/Classfile.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/Classfile.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/CompilerException.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/CompilerException.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/CompilerException.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/CompilerException.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/CompilerTypes.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/CompilerTypes.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/CompilerTypes.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/CompilerTypes.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/ConstantPool.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/ConstantPool.java similarity index 95% rename from src/cz/cvut/fit/ostrajava/Compiler/ConstantPool.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/ConstantPool.java index 97ecf5c..4a5f11a 100644 --- a/src/cz/cvut/fit/ostrajava/Compiler/ConstantPool.java +++ b/src/main/java/cz/cvut/fit/ostrajava/Compiler/ConstantPool.java @@ -1,9 +1,7 @@ package cz.cvut.fit.ostrajava.Compiler; -import com.sun.tools.javac.code.Attribute; import cz.cvut.fit.ostrajava.Interpreter.ClassPool; import cz.cvut.fit.ostrajava.Interpreter.InterpretedClass; -import cz.cvut.fit.ostrajava.Interpreter.InterpretedMethod; import java.util.ArrayList; import java.util.LinkedHashSet; diff --git a/src/cz/cvut/fit/ostrajava/Compiler/Continue.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/Continue.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/Continue.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/Continue.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/Field.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/Field.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/Field.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/Field.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/Instruction.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/Instruction.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/Instruction.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/Instruction.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/InstructionSet.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/InstructionSet.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/InstructionSet.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/InstructionSet.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/Method.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/Method.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/Method.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/Method.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/MethodCompilation.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/MethodCompilation.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/MethodCompilation.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/MethodCompilation.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/OSTRAJavaCompiler.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/OSTRAJavaCompiler.java similarity index 99% rename from src/cz/cvut/fit/ostrajava/Compiler/OSTRAJavaCompiler.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/OSTRAJavaCompiler.java index 8a0a630..3f95e80 100644 --- a/src/cz/cvut/fit/ostrajava/Compiler/OSTRAJavaCompiler.java +++ b/src/main/java/cz/cvut/fit/ostrajava/Compiler/OSTRAJavaCompiler.java @@ -5,9 +5,7 @@ import cz.cvut.fit.ostrajava.Parser.*; import cz.cvut.fit.ostrajava.Type.*; import sun.reflect.generics.reflectiveObjects.NotImplementedException; -import sun.tools.tree.UnaryExpression; -import java.lang.reflect.Array; import java.util.*; /** @@ -1476,9 +1474,9 @@ protected void invokeMethod(Class objClass, String name, List argTypes, bo //We can't invoke non-static method statically // (We can invoke static method non-statically though - if (staticCall && !method.isStaticMethod()) { + /*if (staticCall && !method.isStaticMethod()) { throw new CompilerException("Trying to invoke non-static method with a static call"); - } + }*/ if (specialCall) { diff --git a/src/cz/cvut/fit/ostrajava/Compiler/TypeException.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/TypeException.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/TypeException.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/TypeException.java diff --git a/src/cz/cvut/fit/ostrajava/Compiler/Variable.java b/src/main/java/cz/cvut/fit/ostrajava/Compiler/Variable.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Compiler/Variable.java rename to src/main/java/cz/cvut/fit/ostrajava/Compiler/Variable.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/ByteArrayWrapper.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/ByteArrayWrapper.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/ByteArrayWrapper.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/ByteArrayWrapper.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/ClassPool.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/ClassPool.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/ClassPool.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/ClassPool.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Converter.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Converter.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Converter.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Converter.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Debugger.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Debugger.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Debugger.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Debugger.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Frame.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Frame.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Frame.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Frame.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Instructions.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Instructions.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Instructions.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Instructions.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/InterpretedClass.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/InterpretedClass.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/InterpretedClass.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/InterpretedClass.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/InterpretedMethod.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/InterpretedMethod.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/InterpretedMethod.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/InterpretedMethod.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/InterpreterException.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/InterpreterException.java similarity index 81% rename from src/cz/cvut/fit/ostrajava/Interpreter/InterpreterException.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/InterpreterException.java index a12e29a..27dcb70 100644 --- a/src/cz/cvut/fit/ostrajava/Interpreter/InterpreterException.java +++ b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/InterpreterException.java @@ -1,6 +1,5 @@ package cz.cvut.fit.ostrajava.Interpreter; -import sun.jvm.hotspot.interpreter.Interpreter; /** * Created by tomaskohout on 11/17/15. diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/LookupException.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/LookupException.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/LookupException.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/LookupException.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/Array.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/Array.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/Array.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/Array.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/DirtyLink.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/DirtyLink.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/DirtyLink.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/DirtyLink.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/GarbageCollector.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/GarbageCollector.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/GarbageCollector.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/GarbageCollector.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/GenerationCollector.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/GenerationCollector.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/GenerationCollector.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/GenerationCollector.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/MarkAndSweepCollector.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/MarkAndSweepCollector.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/MarkAndSweepCollector.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/MarkAndSweepCollector.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/State.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/State.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/State.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/GarbageCollector/State.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/GenerationHeap.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/GenerationHeap.java similarity index 98% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/GenerationHeap.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/GenerationHeap.java index 5f7ba8c..607cd96 100644 --- a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/GenerationHeap.java +++ b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/GenerationHeap.java @@ -1,6 +1,5 @@ package cz.cvut.fit.ostrajava.Interpreter.Memory; -import com.sun.tools.javac.util.ArrayUtils; import cz.cvut.fit.ostrajava.Interpreter.InterpretedClass; import cz.cvut.fit.ostrajava.Interpreter.Memory.GarbageCollector.GenerationCollector; import cz.cvut.fit.ostrajava.Interpreter.Memory.GarbageCollector.MarkAndSweepCollector; diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/Heap.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/Heap.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/Heap.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/Heap.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/HeapItem.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/HeapItem.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/HeapItem.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/HeapItem.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/HeapOverflow.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/HeapOverflow.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/HeapOverflow.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/HeapOverflow.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/Object.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/Object.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/Object.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/Object.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Memory/SimpleHeap.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/SimpleHeap.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Memory/SimpleHeap.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Memory/SimpleHeap.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/ArraySize.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/ArraySize.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/ArraySize.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/ArraySize.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/CharArraySize.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/CharArraySize.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/CharArraySize.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/CharArraySize.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/IntArraySize.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/IntArraySize.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/IntArraySize.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/IntArraySize.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/ReferenceArraySize.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/ReferenceArraySize.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/ReferenceArraySize.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Array/ReferenceArraySize.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/CharArrayToInt.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/CharArrayToInt.java similarity index 99% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/CharArrayToInt.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/CharArrayToInt.java index c489e04..05b5b7d 100644 --- a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/CharArrayToInt.java +++ b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/CharArrayToInt.java @@ -23,6 +23,7 @@ public StackValue invoke(StackValue[] args) throws HeapOverflow, InterpreterExce Array array = heap.loadArray(ref); char[] chars = Converter.arrayToCharArray(array); + int i = Integer.parseInt(new String(chars)); StackValue result = new StackValue(i, StackValue.Type.Primitive); diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/IntToCharArray.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/IntToCharArray.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/IntToCharArray.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Conversion/IntToCharArray.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintBool.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintBool.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintBool.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintBool.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintChar.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintChar.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintChar.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintChar.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintChars.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintChars.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintChars.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintChars.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintFloat.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintFloat.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintFloat.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintFloat.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintInt.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintInt.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintInt.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/Console/PrintInt.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/CloseReader.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/CloseReader.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/CloseReader.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/CloseReader.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/OpenReader.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/OpenReader.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/OpenReader.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/OpenReader.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/ReadLine.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/ReadLine.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/ReadLine.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/ReadLine.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/Readers.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/Readers.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/Readers.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/IO/File/Readers.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/Math/LogInt.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Math/LogInt.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/Math/LogInt.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Math/LogInt.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/Math/PowInt.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Math/PowInt.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/Math/PowInt.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Math/PowInt.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/Native.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Native.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/Native.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Native.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Natives/Natives.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Natives.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Natives/Natives.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Natives/Natives.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/OSTRAJavaInterpreter.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/OSTRAJavaInterpreter.java similarity index 99% rename from src/cz/cvut/fit/ostrajava/Interpreter/OSTRAJavaInterpreter.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/OSTRAJavaInterpreter.java index 443d89d..e34bf8c 100644 --- a/src/cz/cvut/fit/ostrajava/Interpreter/OSTRAJavaInterpreter.java +++ b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/OSTRAJavaInterpreter.java @@ -83,6 +83,8 @@ public void run(List arguments) throws InterpreterException, HeapOverflo + + public void interpret(int startingPosition) throws InterpreterException, HeapOverflow { instructions.goTo(startingPosition); diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/Stack.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/Stack.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/Stack.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/Stack.java diff --git a/src/cz/cvut/fit/ostrajava/Interpreter/StackValue.java b/src/main/java/cz/cvut/fit/ostrajava/Interpreter/StackValue.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Interpreter/StackValue.java rename to src/main/java/cz/cvut/fit/ostrajava/Interpreter/StackValue.java diff --git a/src/cz/cvut/fit/ostrajava/Main.java b/src/main/java/cz/cvut/fit/ostrajava/Main.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Main.java rename to src/main/java/cz/cvut/fit/ostrajava/Main.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTAdditiveExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAdditiveExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTAdditiveExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAdditiveExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTAllocationExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAllocationExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTAllocationExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAllocationExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTAndOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAndOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTAndOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAndOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTArgumentList.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTArgumentList.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTArgumentList.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTArgumentList.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTArguments.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTArguments.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTArguments.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTArguments.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTArrayDimensions.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTArrayDimensions.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTArrayDimensions.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTArrayDimensions.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTArraySuffix.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTArraySuffix.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTArraySuffix.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTArraySuffix.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTArrayType.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTArrayType.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTArrayType.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTArrayType.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTAssignee.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAssignee.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTAssignee.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAssignee.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTAssigneePrefix.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAssigneePrefix.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTAssigneePrefix.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAssigneePrefix.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTAssigneeSuffix.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAssigneeSuffix.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTAssigneeSuffix.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAssigneeSuffix.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTAssignment.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAssignment.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTAssignment.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAssignment.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTAssignmentOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAssignmentOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTAssignmentOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTAssignmentOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTBlock.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTBlock.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTBlock.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTBlock.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTBlockStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTBlockStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTBlockStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTBlockStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTBool.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTBool.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTBool.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTBool.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTBreakStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTBreakStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTBreakStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTBreakStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTChar.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTChar.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTChar.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTChar.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTCharLiteral.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTCharLiteral.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTCharLiteral.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTCharLiteral.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTClass.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTClass.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTClass.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTClass.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTClassBodyDeclaration.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTClassBodyDeclaration.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTClassBodyDeclaration.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTClassBodyDeclaration.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTClassDeclaration.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTClassDeclaration.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTClassDeclaration.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTClassDeclaration.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTCompilationUnit.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTCompilationUnit.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTCompilationUnit.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTCompilationUnit.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTConditionalAndExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTConditionalAndExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTConditionalAndExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTConditionalAndExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTConditionalExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTConditionalExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTConditionalExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTConditionalExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTConditionalOrExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTConditionalOrExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTConditionalOrExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTConditionalOrExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTConstructorDeclaration.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTConstructorDeclaration.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTConstructorDeclaration.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTConstructorDeclaration.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTContinueStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTContinueStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTContinueStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTContinueStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTDebugStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTDebugStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTDebugStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTDebugStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTDivideOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTDivideOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTDivideOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTDivideOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTDoStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTDoStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTDoStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTDoStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTEmptyStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTEmptyStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTEmptyStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTEmptyStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTEqualOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTEqualOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTEqualOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTEqualOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTEqualityExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTEqualityExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTEqualityExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTEqualityExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTExplicitConstructorInvocation.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTExplicitConstructorInvocation.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTExplicitConstructorInvocation.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTExplicitConstructorInvocation.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTFalse.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFalse.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTFalse.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFalse.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTFieldDeclaration.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFieldDeclaration.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTFieldDeclaration.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFieldDeclaration.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTFloat.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFloat.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTFloat.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFloat.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTFloatLiteral.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFloatLiteral.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTFloatLiteral.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFloatLiteral.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTForInit.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTForInit.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTForInit.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTForInit.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTForStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTForStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTForStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTForStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTForUpdate.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTForUpdate.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTForUpdate.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTForUpdate.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTFormalParameter.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFormalParameter.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTFormalParameter.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFormalParameter.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTFormalParameters.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFormalParameters.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTFormalParameters.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTFormalParameters.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTGreaterThanOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTGreaterThanOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTGreaterThanOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTGreaterThanOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTGreaterThanOrEqualOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTGreaterThanOrEqualOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTGreaterThanOrEqualOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTGreaterThanOrEqualOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTIfStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTIfStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTIfStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTIfStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTInstanceOfExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTInstanceOfExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTInstanceOfExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTInstanceOfExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTLessThanOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTLessThanOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTLessThanOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTLessThanOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTLessThanOrEqualOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTLessThanOrEqualOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTLessThanOrEqualOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTLessThanOrEqualOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTLiteral.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTLiteral.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTLiteral.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTLiteral.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTLocalVariableDeclaration.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTLocalVariableDeclaration.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTLocalVariableDeclaration.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTLocalVariableDeclaration.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTMethod.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMethod.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTMethod.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMethod.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclaration.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclaration.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclaration.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclaration.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclarationLookahead.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclarationLookahead.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclarationLookahead.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclarationLookahead.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclarator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclarator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclarator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMethodDeclarator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTMinusOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMinusOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTMinusOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMinusOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTModuloOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTModuloOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTModuloOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTModuloOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTMultiplicativeExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMultiplicativeExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTMultiplicativeExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMultiplicativeExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTMultiplyOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMultiplyOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTMultiplyOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTMultiplyOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTName.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTName.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTName.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTName.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTNameList.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNameList.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTNameList.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNameList.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTNative.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNative.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTNative.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNative.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTNegationOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNegationOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTNegationOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNegationOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTNotEqualOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNotEqualOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTNotEqualOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNotEqualOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTNullLiteral.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNullLiteral.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTNullLiteral.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNullLiteral.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTNumber.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNumber.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTNumber.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNumber.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTNumberLiteral.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNumberLiteral.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTNumberLiteral.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNumberLiteral.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTNumberValue.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNumberValue.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTNumberValue.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTNumberValue.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTOrOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTOrOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTOrOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTOrOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTPlusOperator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPlusOperator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTPlusOperator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPlusOperator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTPrimaryExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPrimaryExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTPrimaryExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPrimaryExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTPrimaryPrefix.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPrimaryPrefix.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTPrimaryPrefix.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPrimaryPrefix.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTPrimarySuffix.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPrimarySuffix.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTPrimarySuffix.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPrimarySuffix.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTPrimitive.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPrimitive.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTPrimitive.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPrimitive.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTPrintStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPrintStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTPrintStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTPrintStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTRelationalExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTRelationalExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTRelationalExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTRelationalExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTResultType.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTResultType.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTResultType.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTResultType.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTReturnStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTReturnStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTReturnStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTReturnStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTStatementExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTStatementExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTStatementExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTStatementExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTStatementExpressionList.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTStatementExpressionList.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTStatementExpressionList.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTStatementExpressionList.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTStatic.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTStatic.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTStatic.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTStatic.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTString.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTString.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTString.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTString.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTStringLiteral.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTStringLiteral.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTStringLiteral.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTStringLiteral.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTSuper.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTSuper.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTSuper.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTSuper.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTSwitchLabel.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTSwitchLabel.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTSwitchLabel.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTSwitchLabel.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTSwitchStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTSwitchStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTSwitchStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTSwitchStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTThis.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTThis.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTThis.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTThis.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTThrowStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTThrowStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTThrowStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTThrowStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTTrue.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTTrue.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTTrue.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTTrue.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTTryStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTTryStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTTryStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTTryStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTType.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTType.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTType.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTType.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTTypeDeclaration.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTTypeDeclaration.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTTypeDeclaration.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTTypeDeclaration.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTUnaryExpression.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTUnaryExpression.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTUnaryExpression.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTUnaryExpression.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTUnaryExpressionNotPlusMinus.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTUnaryExpressionNotPlusMinus.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTUnaryExpressionNotPlusMinus.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTUnaryExpressionNotPlusMinus.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTVariable.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTVariable.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTVariable.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTVariable.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTVariableDeclarator.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTVariableDeclarator.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTVariableDeclarator.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTVariableDeclarator.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTVariableInitializer.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTVariableInitializer.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTVariableInitializer.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTVariableInitializer.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ASTWhileStatement.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ASTWhileStatement.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ASTWhileStatement.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ASTWhileStatement.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/JJTOSTRAJavaParserState.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/JJTOSTRAJavaParserState.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/JJTOSTRAJavaParserState.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/JJTOSTRAJavaParserState.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/JavaCharStream.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/JavaCharStream.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/JavaCharStream.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/JavaCharStream.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/Node.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/Node.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/Node.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/Node.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jj b/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jj similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jj rename to src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jj diff --git a/src/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jjt b/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jjt similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jjt rename to src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJava.jjt diff --git a/src/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParser.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParser.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParser.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParser.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserConstants.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserConstants.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserConstants.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserConstants.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserTokenManager.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserTokenManager.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserTokenManager.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserTokenManager.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserTreeConstants.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserTreeConstants.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserTreeConstants.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/OSTRAJavaParserTreeConstants.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/ParseException.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/ParseException.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/ParseException.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/ParseException.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/SimpleNode.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/SimpleNode.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/SimpleNode.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/SimpleNode.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/Token.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/Token.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/Token.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/Token.java diff --git a/src/cz/cvut/fit/ostrajava/Parser/TokenMgrError.java b/src/main/java/cz/cvut/fit/ostrajava/Parser/TokenMgrError.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Parser/TokenMgrError.java rename to src/main/java/cz/cvut/fit/ostrajava/Parser/TokenMgrError.java diff --git a/src/cz/cvut/fit/ostrajava/Run.java b/src/main/java/cz/cvut/fit/ostrajava/Run.java similarity index 92% rename from src/cz/cvut/fit/ostrajava/Run.java rename to src/main/java/cz/cvut/fit/ostrajava/Run.java index 695737e..72a2e1f 100644 --- a/src/cz/cvut/fit/ostrajava/Run.java +++ b/src/main/java/cz/cvut/fit/ostrajava/Run.java @@ -15,6 +15,7 @@ public class Run { + public static void printHelp(){ System.out.println("Pouziti: ostrajava \n"+ "kaj moznosti muzu byt: \n" + @@ -67,13 +68,21 @@ public static void exec(String[] args) throws Exception String directory = arguments.get(0); arguments.remove(0); + List librariesList = loadLibraries(); + List classList = loadClassfiles(directory); + classList.addAll(librariesList); + OSTRAJavaInterpreter interpreter = new OSTRAJavaInterpreter(classList, heap_size, frame_count, stack_size); interpreter.run(arguments); } + public static List loadLibraries() throws IOException { + return loadClassfiles(Compile.COMPILED_LIBRARIES_DIRECTORY); + } + public static List loadClassfiles(String directoryName) throws IOException { File directory = new File(directoryName); diff --git a/src/cz/cvut/fit/ostrajava/Type/ArrayType.java b/src/main/java/cz/cvut/fit/ostrajava/Type/ArrayType.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Type/ArrayType.java rename to src/main/java/cz/cvut/fit/ostrajava/Type/ArrayType.java diff --git a/src/cz/cvut/fit/ostrajava/Type/BooleanType.java b/src/main/java/cz/cvut/fit/ostrajava/Type/BooleanType.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Type/BooleanType.java rename to src/main/java/cz/cvut/fit/ostrajava/Type/BooleanType.java diff --git a/src/cz/cvut/fit/ostrajava/Type/CharType.java b/src/main/java/cz/cvut/fit/ostrajava/Type/CharType.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Type/CharType.java rename to src/main/java/cz/cvut/fit/ostrajava/Type/CharType.java diff --git a/src/cz/cvut/fit/ostrajava/Type/FloatType.java b/src/main/java/cz/cvut/fit/ostrajava/Type/FloatType.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Type/FloatType.java rename to src/main/java/cz/cvut/fit/ostrajava/Type/FloatType.java diff --git a/src/cz/cvut/fit/ostrajava/Type/NumberType.java b/src/main/java/cz/cvut/fit/ostrajava/Type/NumberType.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Type/NumberType.java rename to src/main/java/cz/cvut/fit/ostrajava/Type/NumberType.java diff --git a/src/cz/cvut/fit/ostrajava/Type/ReferenceType.java b/src/main/java/cz/cvut/fit/ostrajava/Type/ReferenceType.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Type/ReferenceType.java rename to src/main/java/cz/cvut/fit/ostrajava/Type/ReferenceType.java diff --git a/src/cz/cvut/fit/ostrajava/Type/StringType.java b/src/main/java/cz/cvut/fit/ostrajava/Type/StringType.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Type/StringType.java rename to src/main/java/cz/cvut/fit/ostrajava/Type/StringType.java diff --git a/src/cz/cvut/fit/ostrajava/Type/Type.java b/src/main/java/cz/cvut/fit/ostrajava/Type/Type.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Type/Type.java rename to src/main/java/cz/cvut/fit/ostrajava/Type/Type.java diff --git a/src/cz/cvut/fit/ostrajava/Type/Types.java b/src/main/java/cz/cvut/fit/ostrajava/Type/Types.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Type/Types.java rename to src/main/java/cz/cvut/fit/ostrajava/Type/Types.java diff --git a/src/cz/cvut/fit/ostrajava/Type/VoidType.java b/src/main/java/cz/cvut/fit/ostrajava/Type/VoidType.java similarity index 100% rename from src/cz/cvut/fit/ostrajava/Type/VoidType.java rename to src/main/java/cz/cvut/fit/ostrajava/Type/VoidType.java diff --git a/tests/cz/cvut/fit/ostrajava/Compiler/OSTRAJavaCompilerTest.java b/tests/cz/cvut/fit/ostrajava/Compiler/OSTRAJavaCompilerTest.java deleted file mode 100644 index 063701f..0000000 --- a/tests/cz/cvut/fit/ostrajava/Compiler/OSTRAJavaCompilerTest.java +++ /dev/null @@ -1,102 +0,0 @@ -package cz.cvut.fit.ostrajava.Compiler; - - -import cz.cvut.fit.ostrajava.Interpreter.ClassPool; -import cz.cvut.fit.ostrajava.Interpreter.LookupException; -import cz.cvut.fit.ostrajava.Parser.ASTCompilationUnit; -import cz.cvut.fit.ostrajava.Parser.OSTRAJavaParser; -import cz.cvut.fit.ostrajava.Parser.ParseException; -import org.junit.Test; - -import java.io.*; -import java.util.List; - -import static org.junit.Assert.*; - -/** - * Created by tomaskohout on 11/14/15. - */ -public class OSTRAJavaCompilerTest { - - @Test - - public void testCompiler() throws Exception { - String code = methodLayout(""); - - ByteCode byteCode = compileSingleMethod(code); - //assertEquals("Bytecode should be empty", byteCode.toString(), ""); - } - - - @Test - public void testPlusMinus() throws Exception { - - String code = "toz cyslo i = 1 pyco i = i + 1 - 2 pyco"; - - ByteCode byteCode = compileSingleMethod(methodLayout(code)); - assertEquals(byteCode.toString(), - "0: ipush 1 \n" + - "1: istore 1 \n" + - "2: iload 1 \n" + - "3: ipush 1 \n" + - "4: iadd \n" + - "5: ipush 2 \n" + - "6: isub \n" + - "7: istore 1 \n"); - } - - @Test - public void testMultiplication() throws Exception { - - String code = "toz cyslo i = 1 pyco i = i / 5 * 3 pyco"; - - ByteCode byteCode = compileSingleMethod(methodLayout(code)); - assertEquals(byteCode.toString(), - "0: ipush 1 \n" + - "1: istore 1 \n" + - "2: iload 1 \n" + - "3: ipush 5 \n" + - "4: idiv \n" + - "5: ipush 3 \n" + - "6: imul \n" + - "7: istore 1 \n"); - } - - protected String methodLayout(String code){ - return "banik pyco " + - "tryda Ostrava {" + - "fraj rynek(){ " + - code + - " }" + - "}" + - "fajront pyco"; - } - - protected ByteCode compileSingleMethod(String code) throws CompilerException, ParseException, LookupException { - StringReader stringReader = new StringReader(code); - - OSTRAJavaParser jp = new OSTRAJavaParser(stringReader); - - jp.CompilationUnit(); - - //Parse - ASTCompilationUnit node = (ASTCompilationUnit)jp.rootNode(); - - - //Compile - OSTRAJavaCompiler compiler = new OSTRAJavaCompiler(); - List classfiles = compiler.precompile(node); - compiler.compile(node, new ClassPool(classfiles)); - - assertTrue(classfiles.size() == 1); - - Class clazz = classfiles.get(0); - - assertTrue(clazz.getMethods().size() == 1); - - Method method = clazz.getMethods().get(0); - - return method.getByteCode(); - } - -} \ No newline at end of file