Apple-2-SW/prog8
1
0
Fork 0
mirror of https://github.com/irmen/prog8.git synced 2025-08-09 19:25:22 +00:00
Code Issues Projects Releases Wiki Activity

module rename

Browse Source
This commit is contained in:
Irmen de Jong
2022-03-11 21:22:16 +01:00
parent 3961f26635
commit 73dbdbcbe6
13 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/modules.xml generated
View File

@@ -5,7 +5,7 @@
<module fileurl="file://$PROJECT_DIR$/codeAst/codeAst.iml" filepath="$PROJECT_DIR$/codeAst/codeAst.iml" /> <module fileurl="file://$PROJECT_DIR$/codeAst/codeAst.iml" filepath="$PROJECT_DIR$/codeAst/codeAst.iml" />
<module fileurl="file://$PROJECT_DIR$/codeCore/codeCore.iml" filepath="$PROJECT_DIR$/codeCore/codeCore.iml" /> <module fileurl="file://$PROJECT_DIR$/codeCore/codeCore.iml" filepath="$PROJECT_DIR$/codeCore/codeCore.iml" />
<module fileurl="file://$PROJECT_DIR$/codeGenCpu6502/codeGenCpu6502.iml" filepath="$PROJECT_DIR$/codeGenCpu6502/codeGenCpu6502.iml" /> <module fileurl="file://$PROJECT_DIR$/codeGenCpu6502/codeGenCpu6502.iml" filepath="$PROJECT_DIR$/codeGenCpu6502/codeGenCpu6502.iml" />
<module fileurl="file://$PROJECT_DIR$/codeGenExperimental6502/codeGenExperimental6502.iml" filepath="$PROJECT_DIR$/codeGenExperimental6502/codeGenExperimental6502.iml" /> <module fileurl="file://$PROJECT_DIR$/codeGenExperimental/codeGenExperimental.iml" filepath="$PROJECT_DIR$/codeGenExperimental/codeGenExperimental.iml" />
<module fileurl="file://$PROJECT_DIR$/codeOptimizers/codeOptimizers.iml" filepath="$PROJECT_DIR$/codeOptimizers/codeOptimizers.iml" /> <module fileurl="file://$PROJECT_DIR$/codeOptimizers/codeOptimizers.iml" filepath="$PROJECT_DIR$/codeOptimizers/codeOptimizers.iml" />
<module fileurl="file://$PROJECT_DIR$/compiler/compiler.iml" filepath="$PROJECT_DIR$/compiler/compiler.iml" /> <module fileurl="file://$PROJECT_DIR$/compiler/compiler.iml" filepath="$PROJECT_DIR$/compiler/compiler.iml" />
<module fileurl="file://$PROJECT_DIR$/compilerAst/compilerAst.iml" filepath="$PROJECT_DIR$/compilerAst/compilerAst.iml" /> <module fileurl="file://$PROJECT_DIR$/compilerAst/compilerAst.iml" filepath="$PROJECT_DIR$/compilerAst/compilerAst.iml" />

0
codeGenExperimental6502/build.gradle → codeGenExperimental/build.gradle
View File

0
codeGenExperimental6502/codeGenExperimental6502.iml → codeGenExperimental/codeGenExperimental.iml
View File

4
codeGenExperimental6502/src/prog8/codegen/experimental6502/AsmGen.kt → codeGenExperimental/src/prog8/codegen/experimental/AsmGen.kt
View File

@@ -1,4 +1,4 @@
package prog8.codegen.experimental6502 package prog8.codegen.experimental
import prog8.code.SymbolTable import prog8.code.SymbolTable
import prog8.code.ast.PtProgram import prog8.code.ast.PtProgram
@@ -25,7 +25,7 @@ class AsmGen(internal val program: PtProgram,
override fun compileToAssembly(): IAssemblyProgram? { override fun compileToAssembly(): IAssemblyProgram? {
println("\n** experimental 65(c)02 code generator **\n") println("\n** experimental code generator **\n")
symbolTable.print() symbolTable.print()
symbolTable.flat.forEach { println(it) } symbolTable.flat.forEach { println(it) }

2
codeGenExperimental6502/src/prog8/codegen/experimental6502/AssemblyProgram.kt → codeGenExperimental/src/prog8/codegen/experimental/AssemblyProgram.kt
View File

@@ -1,4 +1,4 @@
package prog8.codegen.experimental6502 package prog8.codegen.experimental
import prog8.code.core.CompilationOptions import prog8.code.core.CompilationOptions
import prog8.code.core.IAssemblyProgram import prog8.code.core.IAssemblyProgram

2
compiler/build.gradle
View File

@@ -32,7 +32,7 @@ dependencies {
implementation project(':codeOptimizers') implementation project(':codeOptimizers')
implementation project(':compilerAst') implementation project(':compilerAst')
implementation project(':codeGenCpu6502') implementation project(':codeGenCpu6502')
implementation project(':codeGenExperimental6502') implementation project(':codeGenExperimental')
implementation 'org.antlr:antlr4-runtime:4.9.3' implementation 'org.antlr:antlr4-runtime:4.9.3'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
// implementation "org.jetbrains.kotlin:kotlin-reflect" // implementation "org.jetbrains.kotlin:kotlin-reflect"

2
compiler/compiler.iml
View File

@@ -21,6 +21,6 @@
<orderEntry type="module" module-name="compilerAst" /> <orderEntry type="module" module-name="compilerAst" />
<orderEntry type="module" module-name="codeOptimizers" /> <orderEntry type="module" module-name="codeOptimizers" />
<orderEntry type="module" module-name="codeGenCpu6502" /> <orderEntry type="module" module-name="codeGenCpu6502" />
<orderEntry type="module" module-name="codeGenExperimental6502" /> <orderEntry type="module" module-name="codeGenExperimental" />
</component> </component>
</module> </module>

2
compiler/src/prog8/compiler/Compiler.kt
View File

@@ -403,7 +403,7 @@ internal fun asmGeneratorFor(program: Program,
// TODO for now, only use the new Intermediary Ast for this experimental codegen: // TODO for now, only use the new Intermediary Ast for this experimental codegen:
val intermediateAst = IntermediateAstMaker(program).transform() val intermediateAst = IntermediateAstMaker(program).transform()
return prog8.codegen.experimental6502.AsmGen(intermediateAst, errors, symbolTable, options) return prog8.codegen.experimental.AsmGen(intermediateAst, errors, symbolTable, options)
} }
} else { } else {
if (options.compTarget.machine.cpu in arrayOf(CpuType.CPU6502, CpuType.CPU65c02)) if (options.compTarget.machine.cpu in arrayOf(CpuType.CPU6502, CpuType.CPU65c02))

2
parser/antlr/Makefile
View File

@@ -1,3 +1,3 @@
parser: parser:
./antlr.sh -o ../src/prog8/parser -no-listener -no-visitor -package prog8.parser -Dlanguage=Java Prog8ANTLR.g4 antlr4 -o ../src/prog8/parser -no-listener -no-visitor -package prog8.parser -Dlanguage=Java Prog8ANTLR.g4

6
parser/antlr/antlr.sh
View File

@@ -1,6 +0,0 @@
#!/bin/sh
PROJECT=~/Projects/prog8/compiler/antlr
export CLASSPATH=".:${PROJECT}/lib/antlr-4.7.1-complete.jar:${CLASSPATH}"
java -jar ${PROJECT}/lib/antlr-4.7.1-complete.jar $*

7
parser/antlr/grun.sh
View File

@@ -1,7 +0,0 @@
#!/bin/sh
PROJECT=~/Projects/prog8/compiler/antlr
export CLASSPATH=".:${PROJECT}/lib/antlr-4.7.1-complete.jar:${CLASSPATH}"
java org.antlr.v4.gui.TestRig $*

2
scripts/clean.sh
View File

@@ -2,5 +2,5 @@
rm -f *.bin *.xex *.jar *.asm *.prg *.vm.txt *.vice-mon-list *.list a.out imgui.ini rm -f *.bin *.xex *.jar *.asm *.prg *.vm.txt *.vice-mon-list *.list a.out imgui.ini
rm -rf build out rm -rf build out
rm -rf compiler/build codeGenCpu6502/build codeGenExperimental6502/build codeOptimizers/build compilerAst/build dbusCompilerService/build httpCompilerService/build parser/build rm -rf compiler/build codeGenCpu6502/build codeGenExperimental/build codeOptimizers/build compilerAst/build dbusCompilerService/build httpCompilerService/build parser/build

2
settings.gradle
View File

@@ -5,7 +5,7 @@ include(
':compilerAst', ':compilerAst',
':codeOptimizers', ':codeOptimizers',
':codeGenCpu6502', ':codeGenCpu6502',
':codeGenExperimental6502', ':codeGenExperimental',
':compiler', ':compiler',
':dbusCompilerService', ':dbusCompilerService',
':httpCompilerService' ':httpCompilerService'