search

mattunlv / ProcessJ-main-branch-old

ProcessJ Compiler Project
2 stars 4 forks source link

Java codegenerator #2

Closed cabelshrestha closed 8 years ago

mattunlv commented 8 years ago

still don't' see the txt files ?

Matt

On Oct 15, 2016, at 8:33 PM, Cabel Shrestha wrote:

You can view, comment on, or merge this pull request online at:

https://github.com/mattunlv/ProcessJ/pull/2

Commit Summary

added java-notes.txt Merge remote-tracking branch 'origin/master' into java-codegenerator Initial merge of Cabel's code into the branch. Changes in instrumenter Finalized instrumenter. Instrumenter: removed copy logic Resume to label instead of yield Merge branch 'master' of https://github.com/mattunlv/ProcessJ-Compiler into java-codegenerator Merged master changes in ProcessJc initial commit of runtime Modified Code Generation Logic for Channel Read/Write Updates for channel read expr in invocation Invocation & ChannelReadExpr updates. Par Block Implementation Many Changes: Merge branch 'master' into java-codegenerator Runtime completed Merge branch 'master' into java-codegenerator More changes.

  • Implemented More Constructs: Bug Fixes: Updates in Claims, NewArray and Random lib Deleted runtime.Activation class. Refactored names for all runtime concurrency constructs to start with 'PJ' to prevent any naming conflicts with Java standard lib or third party lib classes. Bug Fixes Bug Fix in Instrumenter Manual merge of Reachability codes. Bug fix for invocation in nested par/parfors. jars added blah blah all changes at the end of the thesis. removed some files from default package Rename Random.java to random.java Bug fix and code clean up. removed unclaim logic in the yield code block if unable to unclaim Fixed random_wait implementation. Runtime classes updated with JavaDocs. Adding template files. Adding switchPJ script. Renaming some script files. Modified claim mechanism to only allow claiming channel ends instead of whole channels. Cleaned system outputs. File cleanup. Prefixing proc names with 'proc' to avoid conflict with classname in generated Java code. Handling block statement in altStat and procTypeDecl. Added extern type, updated pjc script and performed some file cleanup. Fixed qualified package issue for included library imports. Organizing imports and formatting code. Added missing package declaration. Update gitignore to skip scanner and parser generated class files. .gitignore update Major refactoring in code generator and string templates. File Changes

M .gitignore (10) A Tests/CodeGeneratorTestsJava/AltSimpleTest.pj (25) A Tests/CodeGeneratorTestsJava/Alternative.pj (32) A Tests/CodeGeneratorTestsJava/AnnotationYeildTest.pj (24) A Tests/CodeGeneratorTestsJava/ArrayAccessExpr.pj (8) A Tests/CodeGeneratorTestsJava/Assignment.pj (31) A Tests/CodeGeneratorTestsJava/CastExpr.pj (19) A Tests/CodeGeneratorTestsJava/ContinueStat.pj (22) A Tests/CodeGeneratorTestsJava/NameGlobalizationTest.pj (39) A Tests/CodeGeneratorTestsJava/OldTests/badtests/3000/3000.pj (10) A Tests/CodeGeneratorTestsJava/OldTests/badtests/3000/3001.pj (11) A Tests/CodeGeneratorTestsJava/OldTests/badtests/3000/3003.pj (10) A Tests/CodeGeneratorTestsJava/OldTests/badtests/3000/3004.pj (10) A Tests/CodeGeneratorTestsJava/OldTests/badtests/3000/3005.pj (10) A Tests/CodeGeneratorTestsJava/OldTests/badtests/3000/3006.pj (10) A Tests/CodeGeneratorTestsJava/OldTests/badtests/3000/3035.pj (16) A Tests/CodeGeneratorTestsJava/OldTests/java/test.java (164) A Tests/CodeGeneratorTestsJava/OldTests/java/test1.java (6) A Tests/CodeGeneratorTestsJava/OldTests/java/test2.java (6) A Tests/CodeGeneratorTestsJava/OldTests/occam/santa-paper-4.occ (136) A Tests/CodeGeneratorTestsJava/OldTests/occam/test.occ (46) A Tests/CodeGeneratorTestsJava/OldTests/pj/A.pj (7) A Tests/CodeGeneratorTestsJava/OldTests/pj/A1.pj (5) A Tests/CodeGeneratorTestsJava/OldTests/pj/A2.pj (13) A Tests/CodeGeneratorTestsJava/OldTests/pj/B.pj (1) A Tests/CodeGeneratorTestsJava/OldTests/pj/D.pj (6) A Tests/CodeGeneratorTestsJava/OldTests/pj/F.pj (10) A Tests/CodeGeneratorTestsJava/OldTests/pj/Main.pj (11) A Tests/CodeGeneratorTestsJava/OldTests/pj/T1.pj (48) A Tests/CodeGeneratorTestsJava/OldTests/pj/TooComplicated.pj (34) A Tests/CodeGeneratorTestsJava/OldTests/pj/benari.pj (49) A Tests/CodeGeneratorTestsJava/OldTests/pj/commstime.pj (52) A Tests/CodeGeneratorTestsJava/OldTests/pj/foo.pj (3) A Tests/CodeGeneratorTestsJava/OldTests/pj/imp.pj (4) A Tests/CodeGeneratorTestsJava/OldTests/pj/importtest.pj (11) A Tests/CodeGeneratorTestsJava/OldTests/pj/lib.pj (8) A Tests/CodeGeneratorTestsJava/OldTests/pj/m.pj (39) A Tests/CodeGeneratorTestsJava/OldTests/pj/math.pj (55) A Tests/CodeGeneratorTestsJava/OldTests/pj/p.pj (34) A Tests/CodeGeneratorTestsJava/OldTests/pj/pc.pj (28) A Tests/CodeGeneratorTestsJava/OldTests/pj/t.pj (43) A Tests/CodeGeneratorTestsJava/OldTests/pj/t3.pj (22) A Tests/CodeGeneratorTestsJava/OldTests/pj/t4.pj (10) A Tests/CodeGeneratorTestsJava/OldTests/pj/t5.pj (23) A Tests/CodeGeneratorTestsJava/OldTests/pj/t9.pj (1) A Tests/CodeGeneratorTestsJava/OldTests/pj/test.pj (89) A Tests/CodeGeneratorTestsJava/OldTests/pj/test1.pj (31) A Tests/CodeGeneratorTestsJava/OldTests/pj/test2.pj (25) A Tests/CodeGeneratorTestsJava/OldTests/pj/test3.pj (29) A Tests/CodeGeneratorTestsJava/OldTests/pj/test4.pj (2) A Tests/CodeGeneratorTestsJava/OldTests/pj/test5.pj (11) A Tests/CodeGeneratorTestsJava/OldTests/pj/test55.pj (7) A Tests/CodeGeneratorTestsJava/OldTests/pj/test7.pj (7) A Tests/CodeGeneratorTestsJava/OldTests/pj/tt1.pj (51) A Tests/CodeGeneratorTestsJava/OldTests/pj/whyCrash.pj (32) A Tests/CodeGeneratorTestsJava/OldTests/pj/x.pj (6) A Tests/CodeGeneratorTestsJava/OldTests/pj/y.pj (4) A Tests/CodeGeneratorTestsJava/OldTests/runtime/Main5.java (301) A Tests/CodeGeneratorTestsJava/OldTests/runtime/Main6.java (251) A Tests/CodeGeneratorTestsJava/OldTests/runtime/Main7.java (233) A Tests/CodeGeneratorTestsJava/OldTests/runtime/Main8.java (187) A Tests/CodeGeneratorTestsJava/OldTests/runtime/Main9.java (196) A Tests/CodeGeneratorTestsJava/OldTests/runtime/test.java (45) A Tests/CodeGeneratorTestsJava/ParamDecl.pj (7) A Tests/CodeGeneratorTestsJava/ProcToInnerClass.pj (30) A Tests/CodeGeneratorTestsJava/SwitchStat.pj (25) A Tests/CodeGeneratorTestsJava/Ternary.pj (9) A Tests/CodeGeneratorTestsJava/TimerTest.pj (21) A Tests/CodeGeneratorTestsJava/chanOne2ManyALTTest.pj (58) A Tests/CodeGeneratorTestsJava/chanOne2ManyTest.pj (37) R Tests/CodeGeneratorTestsJava/channelM2OTest.pj (13) A Tests/CodeGeneratorTestsJava/channelO2MTest.pj (27) A Tests/CodeGeneratorTestsJava/channelTest.pj (60) A Tests/CodeGeneratorTestsJava/channelbool.pj (15) A Tests/CodeGeneratorTestsJava/commstime.pj (52) A Tests/CodeGeneratorTestsJava/complexMutual.pj (35) A Tests/CodeGeneratorTestsJava/complexRecurseTest.pj (88) A Tests/CodeGeneratorTestsJava/display_proc.pj (86) A Tests/CodeGeneratorTestsJava/doWhileLoop.pj (14) A Tests/CodeGeneratorTestsJava/emptyMain.pj (7) A Tests/CodeGeneratorTestsJava/expressions.pj (11) A Tests/CodeGeneratorTestsJava/foo1.pj (4) A Tests/CodeGeneratorTestsJava/foo2.pj (6) A Tests/CodeGeneratorTestsJava/foo3.pj (9) A Tests/CodeGeneratorTestsJava/forLoop.pj (11) A Tests/CodeGeneratorTestsJava/fullAdder.pj (312) A Tests/CodeGeneratorTestsJava/helloWorld.pj (9) A Tests/CodeGeneratorTestsJava/ifStatement.pj (24) A Tests/CodeGeneratorTestsJava/invocationSimpleTest.pj (16) A Tests/CodeGeneratorTestsJava/listing.pj (21) A Tests/CodeGeneratorTestsJava/mandelbrot-codegenErrs.pj (49) A Tests/CodeGeneratorTestsJava/mandelbrot.pj (46) A Tests/CodeGeneratorTestsJava/millionprocess.pj (22) A Tests/CodeGeneratorTestsJava/millionprocess1.pj (38) A Tests/CodeGeneratorTestsJava/moreRecordTest.pj (30) A Tests/CodeGeneratorTestsJava/nestedParTest.pj (29) A Tests/CodeGeneratorTestsJava/nestedParfor.pj (18) A Tests/CodeGeneratorTestsJava/not-done/AltFullExample.pj (66) A Tests/CodeGeneratorTestsJava/not-done/AlternativeSkip.pj (17) A Tests/CodeGeneratorTestsJava/not-done/AlternativeTimeout.pj (19) A Tests/CodeGeneratorTestsJava/not-done/ParExpr.pj (21) A Tests/CodeGeneratorTestsJava/not-done/ParStackTest.pj (23) A Tests/CodeGeneratorTestsJava/not-done/ParStatements.pj (39) A Tests/CodeGeneratorTestsJava/not-done/ParTest.pj (33) A Tests/CodeGeneratorTestsJava/not-done/StackSizeTests/stackTest1.pj (3) A Tests/CodeGeneratorTestsJava/not-done/StackSizeTests/stackTest2.pj (9) A Tests/CodeGeneratorTestsJava/not-done/StackSizeTests/stackTest3.pj (5) A Tests/CodeGeneratorTestsJava/not-done/StackSizeTests/stackTest4.pj (10) A Tests/CodeGeneratorTestsJava/not-done/StackSizeTests/stackTest5.pj (11) A Tests/CodeGeneratorTestsJava/not-done/StackSizeTests/stackTest6.pj (13) A Tests/CodeGeneratorTestsJava/not-done/StackSizeTests/stackTest7.pj (11) A Tests/CodeGeneratorTestsJava/not-done/StackSizeTests/stackTest8.pj (10) A Tests/CodeGeneratorTestsJava/not-done/andGate.pj (36) A Tests/CodeGeneratorTestsJava/not-done/commstime.pj (71) A Tests/CodeGeneratorTestsJava/not-done/function.pj (10) A Tests/CodeGeneratorTestsJava/not-done/id.pj (22) A Tests/CodeGeneratorTestsJava/not-done/insideInvocation.pj (25) A Tests/CodeGeneratorTestsJava/not-done/multipleEmptyFunctions.pj (16) A Tests/CodeGeneratorTestsJava/not-done/multipleInvocations.pj (34) A Tests/CodeGeneratorTestsJava/not-done/multipleInvocationsSameFunction.pj (35) A Tests/CodeGeneratorTestsJava/not-done/nestedFunction.pj (10) A Tests/CodeGeneratorTestsJava/not-done/parBlockTest.pj (47) A Tests/CodeGeneratorTestsJava/not-done/parBlockTest2.pj (20) A Tests/CodeGeneratorTestsJava/not-done/parameters.pj (23) A Tests/CodeGeneratorTestsJava/not-done/printer.pj (50) A Tests/CodeGeneratorTestsJava/not-done/simpleStackTest.pj (15) A Tests/CodeGeneratorTestsJava/not-done/stackTest1.pj (13) A Tests/CodeGeneratorTestsJava/not-done/time.pj (15) A Tests/CodeGeneratorTestsJava/parFromPaper.pj (64) A Tests/CodeGeneratorTestsJava/parRecurseTest.pj (39) A Tests/CodeGeneratorTestsJava/parTestComplex.pj (35) A Tests/CodeGeneratorTestsJava/parinv.pj (27) A Tests/CodeGeneratorTestsJava/plusPlusMinusMinus.pj (24) A Tests/CodeGeneratorTestsJava/printTest.pj (19) A Tests/CodeGeneratorTestsJava/printer.pj (8) A Tests/CodeGeneratorTestsJava/processsize.pj (10) A Tests/CodeGeneratorTestsJava/randomtest.pj (12) A Tests/CodeGeneratorTestsJava/santa.pj (258) A Tests/CodeGeneratorTestsJava/santa_elf.pj (294) A Tests/CodeGeneratorTestsJava/santa_reindeer.pj (284) A Tests/CodeGeneratorTestsJava/santachunk.pj (397) A Tests/CodeGeneratorTestsJava/santapaper4.pj (353) A Tests/CodeGeneratorTestsJava/simpleBarrier.pj (48) A Tests/CodeGeneratorTestsJava/simpleChannel.pj (20) A Tests/CodeGeneratorTestsJava/simpleClaim.pj (56) A Tests/CodeGeneratorTestsJava/simpleExtRv.pj (11) A Tests/CodeGeneratorTestsJava/simpleParTest.pj (25) A Tests/CodeGeneratorTestsJava/simpleParfor.pj (52) A Tests/CodeGeneratorTestsJava/simpleProtocol.pj (31) A Tests/CodeGeneratorTestsJava/simpleRecord.pj (32) A Tests/CodeGeneratorTestsJava/simpleRecurseTest.pj (14) A Tests/CodeGeneratorTestsJava/simpleTimer.pj (6) A Tests/CodeGeneratorTestsJava/test11.pj (12) A Tests/CodeGeneratorTestsJava/test12.pj (30) A Tests/CodeGeneratorTestsJava/test13.pj (7) A Tests/CodeGeneratorTestsJava/test14.pj (6) A Tests/CodeGeneratorTestsJava/test21.pj (0) A Tests/CodeGeneratorTestsJava/test22.pj (9) A Tests/CodeGeneratorTestsJava/verifyError.pj (176) A Tests/test6.java (17) A Tests/test7.java (52) A Tests/test77.java (3) M build.xml (17) A doall (56) A include/JVM/images/pgm.pj (7) M include/JVM/std/io.pj (1) A include/JVM/std/random.pj (8) A include/JVM/std/strings.pj (7) A lib.tar (0) A lib/JVM/images/pgm.java (26) A lib/JVM/std/random.java (13) A lib/JVM/std/strings.java (7) R notes/TODO (2).txt (0) R notes/remember.txt (0) A pj-template (9) M pjc (107) A pjc-template (65) A pjc-template.txt (105) M src/AST/AST.java (186) M src/AST/AltCase.java (32) M src/AST/AltStat.java (30) M src/AST/Annotation.java (20) M src/AST/Annotations.java (33) M src/AST/ArrayAccessExpr.java (31) M src/AST/ArrayLiteral.java (30) M src/AST/ArrayType.java (76) M src/AST/Assignment.java (83) M src/AST/BinaryExpr.java (249) M src/AST/Block.java (21) M src/AST/BreakStat.java (23) M src/AST/CastExpr.java (57) M src/AST/ChannelEndExpr.java (39) M src/AST/ChannelEndType.java (70) M src/AST/ChannelReadExpr.java (26) M src/AST/ChannelType.java (64) M src/AST/ChannelWriteStat.java (25) M src/AST/ClaimStat.java (27) M src/AST/Compilation.java (44) M src/AST/ConstantDecl.java (49) M src/AST/ContinueStat.java (21) M src/AST/DoStat.java (26) M src/AST/ErrorType.java (36) M src/AST/ExprStat.java (21) M src/AST/Expression.java (24) M src/AST/ExternType.java (31) M src/AST/ForStat.java (65) M src/AST/Guard.java (21) M src/AST/IfStat.java (33) M src/AST/ImplicitImport.java (41) M src/AST/Import.java (70) M src/AST/Invocation.java (55) M src/AST/Literal.java (26) M src/AST/LocalDecl.java (58) M src/AST/LoopStatement.java (6) M src/AST/Modifier.java (85) M src/AST/Name.java (182) M src/AST/NameExpr.java (39) M src/AST/NamedType.java (65) M src/AST/NewArray.java (41) M src/AST/NewMobile.java (25) M src/AST/ParBlock.java (26) M src/AST/ParamDecl.java (57) M src/AST/Pragma.java (30) M src/AST/PrimitiveLiteral.java (450) M src/AST/PrimitiveType.java (155) M src/AST/ProcTypeDecl.java (93) M src/AST/ProtocolCase.java (26) M src/AST/ProtocolLiteral.java (35) M src/AST/ProtocolTypeDecl.java (73) M src/AST/QualifiedName.java (47) M src/AST/RecordAccess.java (26) M src/AST/RecordLiteral.java (28) M src/AST/RecordMember.java (26) M src/AST/RecordTypeDecl.java (87) M src/AST/ReturnStat.java (38) M src/AST/Sequence.java (83) M src/AST/SkipStat.java (15) M src/AST/Statement.java (26) M src/AST/StopStat.java (15) M src/AST/SuspendStat.java (35) M src/AST/SwitchGroup.java (28) M src/AST/SwitchLabel.java (32) M src/AST/SwitchStat.java (28) M src/AST/SyncStat.java (21) M src/AST/Ternary.java (61) M src/AST/TimeoutStat.java (26) M src/AST/Token.java (37) M src/AST/TopLevelDecl.java (1) M src/AST/Type.java (335) M src/AST/UnaryPostExpr.java (45) M src/AST/UnaryPreExpr.java (105) M src/AST/Var.java (46) M src/AST/VarDecl.java (8) M src/AST/WhileStat.java (26) D src/AST/nodelist.txt (3) M src/CodeGeneratorJava/CodeGeneratorJava.java (2304) A src/CodeGeneratorJava/Helper.java (154) A src/CodeGeneratorJava/State.java (66) A src/Instrument/Instrumenter.java (420) D src/Library/#Library.java# (434) M src/Library/Library.java (907) M src/NameChecker/ArrayTypeConstructor.java (101) M src/NameChecker/NameChecker.java (793) M src/NameChecker/ResolvePackedTypes.java (136) M src/NameChecker/TopLevelDecls.java (604) M src/ParallelUsageCheck/ParallelUsageCheck.java (395) D src/Parser/#parser.java# (0) I src/Parser/ProcessJ.cup (0) D src/Parser/ProcessJ.cup-backup-101313 (0) D src/Parser/parser.java (0) D src/Parser/sym.java (0) I src/Printers/ParseTreePrinter.java (0) I src/Printers/PrettyPrinter.java (0) A src/ProcessJ/runtime/InactivePool.java (0) A src/ProcessJ/runtime/PJAlt.java (0) A src/ProcessJ/runtime/PJBarrier.java (0) A src/ProcessJ/runtime/PJChannel.java (0) A src/ProcessJ/runtime/PJMany2ManyChannel.java (0) A src/ProcessJ/runtime/PJMany2OneChannel.java (0) A src/ProcessJ/runtime/PJOne2ManyChannel.java (0) A src/ProcessJ/runtime/PJOne2OneChannel.java (0) A src/ProcessJ/runtime/PJPar.java (0) A src/ProcessJ/runtime/PJProcess.java (0) A src/ProcessJ/runtime/PJProtocolCase.java (0) A src/ProcessJ/runtime/PJTimer.java (0) A src/ProcessJ/runtime/RunQueue.java (0) A src/ProcessJ/runtime/Scheduler.java (0) A src/ProcessJ/runtime/TimerQueue.java (0) I src/ProcessJc.java (0) I src/Reachability/Reachability.java (0) I src/ReadInclude.java (0) I src/Scanner/ProcessJ.flex (0) D src/Scanner/Scanner.java (0) A src/StringTemplates/grammarTemplates.stg (0) A src/StringTemplates/grammarTemplatesJava.stg (0) I src/TypeChecker/TypeChecker.java (0) I src/Utilities/ColorCodes.java (0) I src/Utilities/Error.java (0) A src/Utilities/JFlex.jar (0) I src/Utilities/Log.java (0) I src/Utilities/ST-4.0.7.jar (0) Patch Links:

https://github.com/mattunlv/ProcessJ/pull/2.patch https://github.com/mattunlv/ProcessJ/pull/2.diff — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or mute the thread.