From abdbb3234d4236686c64f846cce17e75feb24f2b Mon Sep 17 00:00:00 2001 From: peterdell Date: Thu, 23 Sep 2021 21:32:33 +0200 Subject: [PATCH] Change "CPU" to more general "Target" --- com.wudsn.ide.asm.compilers.test/.project | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../OSGI-INF/l10n/bundle.properties | 6 +- .../OSGI-INF/l10n/bundle_de_DE.properties | 6 +- com.wudsn.ide.asm.compilers.test/plugin.xml | 20 +- .../ide/asm/compiler/test/TestCompiler.xml | 362 ---------- .../asm/compiler/test/TestCompiler.java | 2 +- .../lng/asm/compiler/test/TestCompiler.xml | 167 +++++ .../test/TestCompilerProcessLogParser.java | 2 +- .../test/TestCompilerSourceParser.java | 2 +- .../asm/compiler}/test/TestEditor.java | 2 +- ...AssemblerPreferencesTestCompilersPage.java | 9 +- com.wudsn.ide.asm.compilers/plugin.xml | 138 ++-- .../lng/asm/compiler/acme/AcmeCompiler.xml | 126 ++-- .../lng/asm/compiler/asm6/Asm6Compiler.xml | 108 +-- .../lng/asm/compiler/atasm/AtasmCompiler.xml | 108 +-- .../lng/asm/compiler/dasm/DasmCompiler.xml | 126 ++-- .../asm/compiler/kickass/KickAssCompiler.txt | 2 +- .../asm/compiler/kickass/KickAssCompiler.xml | 636 +++++++++--------- .../lng/asm/compiler/mads/MadsCompiler.xml | 312 ++++----- .../compiler/merlin32/Merlin32Compiler.xml | 122 ++-- .../lng/asm/compiler/xasm/XasmCompiler.xml | 94 +-- ...semblerPreferencesApple2CompilersPage.java | 7 +- ...blerPreferencesAtari2600CompilersPage.java | 7 +- ...blerPreferencesAtari7800CompilersPage.java | 7 +- ...semblerPreferencesAtari8CompilersPage.java | 7 +- .../AssemblerPreferencesC64CompilersPage.java | 7 +- .../AssemblerPreferencesNESCompilersPage.java | 7 +- .../OSGI-INF/l10n/bundle.properties | 10 +- .../OSGI-INF/l10n/bundle_de_DE.properties | 10 +- com.wudsn.ide.asm/schema/compilers.exsd | 4 +- com.wudsn.ide.asm/schema/runners.exsd | 144 ++++ .../com/wudsn/ide/lng/HardwareUtility.java | 1 + .../src/com/wudsn/ide/lng/Language.java | 30 + .../wudsn/ide/lng/{CPU.java => Target.java} | 2 +- .../src/com/wudsn/ide/lng/Texts.java | 2 +- .../src/com/wudsn/ide/lng/Texts.properties | 10 +- .../com/wudsn/ide/lng/Texts_de_DE.properties | 10 +- .../com/wudsn/ide/lng/compiler/Compiler.xml | 186 +++-- .../ide/lng/compiler/CompilerDefinition.java | 10 +- .../ide/lng/compiler/CompilerRegistry.java | 16 +- .../compiler/parser/CompilerSourceParser.java | 2 +- .../lng/compiler/syntax/CompilerSyntax.java | 59 +- .../ide/lng/compiler/syntax/Directive.java | 4 +- .../ide/lng/compiler/syntax/Instruction.java | 8 +- .../lng/compiler/syntax/InstructionSet.java | 18 +- .../wudsn/ide/lng/compiler/syntax/Opcode.java | 16 +- .../wudsn/ide/lng/editor/AssemblerEditor.java | 8 +- .../lng/editor/AssemblerSourceScanner.java | 2 +- .../help/AssemblerHelpContentProducer.java | 22 +- .../ide/lng/help/AssemblerTocProvider.java | 10 +- .../AssemblerPreferencesConstants.java | 14 +- .../AssemblerPreferencesInitializer.java | 4 +- .../lng/preferences/CompilerPreferences.java | 24 +- ... => LanguagePreferencesCompilersPage.java} | 36 +- .../wudsn/ide/base/common/EnumUtility.java | 2 +- com.wudsn.ide.pas/META-INF/MANIFEST.MF | 5 +- .../OSGI-INF/l10n/bundle.properties | 4 +- .../OSGI-INF/l10n/bundle_de_DE.properties | 4 +- com.wudsn.ide.pas/plugin.xml | 8 +- .../wudsn/ide/{ => lng}/pas/Activator.java | 4 +- .../editor/PascalContentAssistProcessor.java | 2 +- .../pas/editor/PascalHoverProvider.java | 2 +- .../pas/editor/PascalReconciler.java | 2 +- .../pas/editor/PascalWordDetector.java | 2 +- .../{ => lng}/pas/editor/PascalWordRule.java | 2 +- .../ValidatorDocumentSetupParticipant.java | 2 +- .../PascalPreferencesApple2CompilersPage.java | 41 ++ ...scalPreferencesAtari2600CompilersPage.java | 41 ++ ...scalPreferencesAtari7800CompilersPage.java | 41 ++ .../PascalPreferencesAtari8CompilersPage.java | 42 ++ .../PascalPreferencesC64CompilersPage.java | 41 ++ .../PascalPreferencesNESCompilersPage.java | 41 ++ 73 files changed, 1794 insertions(+), 1550 deletions(-) delete mode 100644 com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompiler.xml rename com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/{ => lng}/asm/compiler/test/TestCompiler.java (93%) create mode 100644 com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompiler.xml rename com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/{ => lng}/asm/compiler/test/TestCompilerProcessLogParser.java (95%) rename com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/{ => lng}/asm/compiler/test/TestCompilerSourceParser.java (94%) rename com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/{asm/editor => lng/asm/compiler}/test/TestEditor.java (81%) rename com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/{asm/preferences/test => lng/asm/preferences}/AssemblerPreferencesTestCompilersPage.java (81%) create mode 100644 com.wudsn.ide.asm/schema/runners.exsd create mode 100644 com.wudsn.ide.asm/src/com/wudsn/ide/lng/Language.java rename com.wudsn.ide.asm/src/com/wudsn/ide/lng/{CPU.java => Target.java} (95%) rename com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/{AssemblerPreferencesCompilersPage.java => LanguagePreferencesCompilersPage.java} (92%) rename com.wudsn.ide.pas/src/com/wudsn/ide/{ => lng}/pas/Activator.java (90%) rename com.wudsn.ide.pas/src/com/wudsn/ide/{ => lng}/pas/editor/PascalContentAssistProcessor.java (98%) rename com.wudsn.ide.pas/src/com/wudsn/ide/{ => lng}/pas/editor/PascalHoverProvider.java (98%) rename com.wudsn.ide.pas/src/com/wudsn/ide/{ => lng}/pas/editor/PascalReconciler.java (98%) rename com.wudsn.ide.pas/src/com/wudsn/ide/{ => lng}/pas/editor/PascalWordDetector.java (93%) rename com.wudsn.ide.pas/src/com/wudsn/ide/{ => lng}/pas/editor/PascalWordRule.java (96%) rename com.wudsn.ide.pas/src/com/wudsn/ide/{ => lng}/pas/editor/ValidatorDocumentSetupParticipant.java (98%) create mode 100644 com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesApple2CompilersPage.java create mode 100644 com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari2600CompilersPage.java create mode 100644 com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari7800CompilersPage.java create mode 100644 com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari8CompilersPage.java create mode 100644 com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesC64CompilersPage.java create mode 100644 com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesNESCompilersPage.java diff --git a/com.wudsn.ide.asm.compilers.test/.project b/com.wudsn.ide.asm.compilers.test/.project index 06da7998..3ff8dd99 100644 --- a/com.wudsn.ide.asm.compilers.test/.project +++ b/com.wudsn.ide.asm.compilers.test/.project @@ -1,6 +1,6 @@ - com.wudsn.ide.lng.asm.test + com.wudsn.ide.lng.asm.compiler.test diff --git a/com.wudsn.ide.asm.compilers.test/META-INF/MANIFEST.MF b/com.wudsn.ide.asm.compilers.test/META-INF/MANIFEST.MF index 0b98fe86..4c979a3a 100644 --- a/com.wudsn.ide.asm.compilers.test/META-INF/MANIFEST.MF +++ b/com.wudsn.ide.asm.compilers.test/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: WUDSN IDE Assembler Test Compilers Plug-in -Bundle-SymbolicName: com.wudsn.ide.lng.asm.test;singleton:=true +Bundle-SymbolicName: com.wudsn.ide.lng.asm.compiler.test;singleton:=true Bundle-Version: 1.7.2.qualifier Bundle-Vendor: Peter Dell Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/com.wudsn.ide.asm.compilers.test/OSGI-INF/l10n/bundle.properties b/com.wudsn.ide.asm.compilers.test/OSGI-INF/l10n/bundle.properties index 51dfa568..d89d6c18 100644 --- a/com.wudsn.ide.asm.compilers.test/OSGI-INF/l10n/bundle.properties +++ b/com.wudsn.ide.asm.compilers.test/OSGI-INF/l10n/bundle.properties @@ -1,8 +1,8 @@ -com.wudsn.ide.asm.preferences.test.AssemblerPreferencesTestCompilersPage.name=Test Compilers +com.wudsn.ide.lng.asm.preferences.AssemblerPreferencesTestCompilersPage.name=Test Compilers -com.wudsn.ide.asm.compiler.test.TestCompiler.name=TEST +com.wudsn.ide.lng.asm.compiler.test.TestCompiler.name=TEST -com.wudsn.ide.asm.editor.test.TestEditor.name=Test Editor +com.wudsn.ide.lng.asm.compiler.test.TestEditor.name=Test Editor com.wudsn.ide.asm.editor.test.TestSourceFile.name=Test Source File diff --git a/com.wudsn.ide.asm.compilers.test/OSGI-INF/l10n/bundle_de_DE.properties b/com.wudsn.ide.asm.compilers.test/OSGI-INF/l10n/bundle_de_DE.properties index eaf6a521..fb977712 100644 --- a/com.wudsn.ide.asm.compilers.test/OSGI-INF/l10n/bundle_de_DE.properties +++ b/com.wudsn.ide.asm.compilers.test/OSGI-INF/l10n/bundle_de_DE.properties @@ -1,8 +1,8 @@ -com.wudsn.ide.asm.preferences.test.AssemblerPreferencesTestCompilersPage.name=Test Kompiler +com.wudsn.ide.lng.asm.preferences.AssemblerPreferencesTestCompilersPage.name=Test Kompiler -com.wudsn.ide.asm.compiler.test.TestCompiler.name=TEST +com.wudsn.ide.lng.asm.compiler.test.TestCompiler.name=TEST -com.wudsn.ide.asm.editor.test.TestEditor.name=Test Editor +com.wudsn.ide.lng.asm.compiler.test.TestEditor.name=Test Editor com.wudsn.ide.asm.editor.test.TestSourceFile.name=Test Quell-Datei diff --git a/com.wudsn.ide.asm.compilers.test/plugin.xml b/com.wudsn.ide.asm.compilers.test/plugin.xml index 8da32de6..ab08699d 100644 --- a/com.wudsn.ide.asm.compilers.test/plugin.xml +++ b/com.wudsn.ide.asm.compilers.test/plugin.xml @@ -5,26 +5,26 @@ point="org.eclipse.ui.preferencePages"> - - - - + + + + @@ -37,7 +37,7 @@ - diff --git a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompiler.xml b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompiler.xml deleted file mode 100644 index a86fd45e..00000000 --- a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompiler.xml +++ /dev/null @@ -1,362 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompiler.java b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompiler.java similarity index 93% rename from com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompiler.java rename to com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompiler.java index 19505563..63198674 100644 --- a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompiler.java +++ b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompiler.java @@ -17,7 +17,7 @@ * along with WUDSN IDE. If not, see . */ -package com.wudsn.ide.asm.compiler.test; +package com.wudsn.ide.lng.asm.compiler.test; import com.wudsn.ide.lng.compiler.Compiler; import com.wudsn.ide.lng.compiler.CompilerProcessLogParser; diff --git a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompiler.xml b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompiler.xml new file mode 100644 index 00000000..5f5f8a1a --- /dev/null +++ b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompiler.xml @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompilerProcessLogParser.java b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompilerProcessLogParser.java similarity index 95% rename from com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompilerProcessLogParser.java rename to com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompilerProcessLogParser.java index 85275899..88dcf50a 100644 --- a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompilerProcessLogParser.java +++ b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompilerProcessLogParser.java @@ -17,7 +17,7 @@ * along with WUDSN IDE. If not, see . */ -package com.wudsn.ide.asm.compiler.test; +package com.wudsn.ide.lng.asm.compiler.test; import java.util.List; import java.util.StringTokenizer; diff --git a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompilerSourceParser.java b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompilerSourceParser.java similarity index 94% rename from com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompilerSourceParser.java rename to com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompilerSourceParser.java index bcfa93ff..f11fbf46 100644 --- a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/compiler/test/TestCompilerSourceParser.java +++ b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestCompilerSourceParser.java @@ -17,7 +17,7 @@ * along with WUDSN IDE. If not, see . */ -package com.wudsn.ide.asm.compiler.test; +package com.wudsn.ide.lng.asm.compiler.test; import com.wudsn.ide.lng.compiler.parser.CompilerSourceParser; diff --git a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/editor/test/TestEditor.java b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestEditor.java similarity index 81% rename from com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/editor/test/TestEditor.java rename to com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestEditor.java index ab8e0c1b..18bc6292 100644 --- a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/editor/test/TestEditor.java +++ b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/compiler/test/TestEditor.java @@ -1,4 +1,4 @@ -package com.wudsn.ide.asm.editor.test; +package com.wudsn.ide.lng.asm.compiler.test; import com.wudsn.ide.lng.editor.AssemblerEditor; diff --git a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/preferences/test/AssemblerPreferencesTestCompilersPage.java b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesTestCompilersPage.java similarity index 81% rename from com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/preferences/test/AssemblerPreferencesTestCompilersPage.java rename to com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesTestCompilersPage.java index 05c01756..454a8fa2 100644 --- a/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/asm/preferences/test/AssemblerPreferencesTestCompilersPage.java +++ b/com.wudsn.ide.asm.compilers.test/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesTestCompilersPage.java @@ -16,10 +16,11 @@ * You should have received a copy of the GNU General Public License * along with WUDSN IDE. If not, see . */ -package com.wudsn.ide.asm.preferences.test; +package com.wudsn.ide.lng.asm.preferences; import com.wudsn.ide.base.hardware.Hardware; -import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; /** * Visual editor page for the assembler preferences regarding arbitrary @@ -28,13 +29,13 @@ import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; * @author Peter Dell * */ -public final class AssemblerPreferencesTestCompilersPage extends AssemblerPreferencesCompilersPage { +public final class AssemblerPreferencesTestCompilersPage extends LanguagePreferencesCompilersPage { /** * Create is public. Used by extension point "org.eclipse.ui.preferencePages". */ public AssemblerPreferencesTestCompilersPage() { - super(Hardware.TEST); + super(Language.ASM,Hardware.TEST); } diff --git a/com.wudsn.ide.asm.compilers/plugin.xml b/com.wudsn.ide.asm.compilers/plugin.xml index fc46c7c9..220a1fa7 100644 --- a/com.wudsn.ide.asm.compilers/plugin.xml +++ b/com.wudsn.ide.asm.compilers/plugin.xml @@ -50,18 +50,18 @@ id="acme" name="%com.wudsn.ide.lng.asm.compiler.acme.AcmeCompiler.name" version="0.90 (preview)"> - - - - - - - - + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - + + diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/acme/AcmeCompiler.xml b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/acme/AcmeCompiler.xml index 2b62c867..c48b70b9 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/acme/AcmeCompiler.xml +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/acme/AcmeCompiler.xml @@ -8,88 +8,88 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - + - + - + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + - - - - + + + - - - - - + + + + + diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/asm6/Asm6Compiler.xml b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/asm6/Asm6Compiler.xml index a03129c1..38f34b12 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/asm6/Asm6Compiler.xml +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/asm6/Asm6Compiler.xml @@ -15,60 +15,60 @@ instructionsCaseSensitive="false" sourceIncludeDefaultExtension=""> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/atasm/AtasmCompiler.xml b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/atasm/AtasmCompiler.xml index 160487f6..7604e81e 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/atasm/AtasmCompiler.xml +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/atasm/AtasmCompiler.xml @@ -16,237 +16,237 @@ sourceIncludeDefaultExtension=""> /> - - - - - - - - + + + + + + + - - - - - + + + + - - - - - - + + + + + \ No newline at end of file diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/dasm/DasmCompiler.xml b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/dasm/DasmCompiler.xml index dccb2126..6abaf2b0 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/dasm/DasmCompiler.xml +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/dasm/DasmCompiler.xml @@ -16,271 +16,271 @@ sourceIncludeDefaultExtension=""> "); } \ No newline at end of file diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/kickass/KickAssCompiler.xml b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/kickass/KickAssCompiler.xml index 8e82a2fc..cc33dd71 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/kickass/KickAssCompiler.xml +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/kickass/KickAssCompiler.xml @@ -4,51 +4,51 @@ identifierStartCharacters="_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" identifierPartCharacters="_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789" identifierSeparatorCharacter="." labelDefinitionSuffixCharacter=":" macroUsagePrefixCharacter=":" instructionsCaseSensitive="true" sourceIncludeDefaultExtension=""> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - + + + + + + + - - - - - --> + + + - - - - + + - - - - --> + + \ No newline at end of file diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/mads/MadsCompiler.xml b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/mads/MadsCompiler.xml index ef47be91..589d1e2c 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/mads/MadsCompiler.xml +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/mads/MadsCompiler.xml @@ -14,90 +14,90 @@ instructionsCaseSensitive="false" sourceIncludeDefaultExtension="asm"> - - + + @@ -273,49 +273,49 @@ - - + + - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/xasm/XasmCompiler.xml b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/xasm/XasmCompiler.xml index 14cb8415..614fbbc3 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/xasm/XasmCompiler.xml +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/compiler/xasm/XasmCompiler.xml @@ -15,252 +15,252 @@ sourceIncludeDefaultExtension="asx"> diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesApple2CompilersPage.java b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesApple2CompilersPage.java index 67f9242e..9f3626a7 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesApple2CompilersPage.java +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesApple2CompilersPage.java @@ -19,7 +19,8 @@ package com.wudsn.ide.lng.asm.preferences; import com.wudsn.ide.base.hardware.Hardware; -import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; /** * Visual editor page for the assembler preferences regarding Apple 2 compilers. @@ -27,13 +28,13 @@ import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; * @author Peter Dell * */ -public final class AssemblerPreferencesApple2CompilersPage extends AssemblerPreferencesCompilersPage { +public final class AssemblerPreferencesApple2CompilersPage extends LanguagePreferencesCompilersPage { /** * Create is public. Used by extension point "org.eclipse.ui.preferencePages". */ public AssemblerPreferencesApple2CompilersPage() { - super(Hardware.APPLE2); + super(Language.ASM, Hardware.APPLE2); } diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari2600CompilersPage.java b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari2600CompilersPage.java index 10253b04..c7595ab3 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari2600CompilersPage.java +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari2600CompilersPage.java @@ -19,7 +19,8 @@ package com.wudsn.ide.lng.asm.preferences; import com.wudsn.ide.base.hardware.Hardware; -import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; /** * Visual editor page for the assembler preferences regarding Apple 2 compilers. @@ -27,13 +28,13 @@ import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; * @author Peter Dell * */ -public final class AssemblerPreferencesAtari2600CompilersPage extends AssemblerPreferencesCompilersPage { +public final class AssemblerPreferencesAtari2600CompilersPage extends LanguagePreferencesCompilersPage { /** * Create is public. Used by extension point "org.eclipse.ui.preferencePages". */ public AssemblerPreferencesAtari2600CompilersPage() { - super(Hardware.ATARI2600); + super(Language.ASM,Hardware.ATARI2600); } diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari7800CompilersPage.java b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari7800CompilersPage.java index bea9c77e..47d42153 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari7800CompilersPage.java +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari7800CompilersPage.java @@ -19,7 +19,8 @@ package com.wudsn.ide.lng.asm.preferences; import com.wudsn.ide.base.hardware.Hardware; -import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; /** * Visual editor page for the assembler preferences regarding Apple 2 compilers. @@ -27,13 +28,13 @@ import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; * @author Peter Dell * */ -public final class AssemblerPreferencesAtari7800CompilersPage extends AssemblerPreferencesCompilersPage { +public final class AssemblerPreferencesAtari7800CompilersPage extends LanguagePreferencesCompilersPage { /** * Create is public. Used by extension point "org.eclipse.ui.preferencePages". */ public AssemblerPreferencesAtari7800CompilersPage() { - super(Hardware.ATARI7800); + super(Language.ASM, Hardware.ATARI7800); } diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari8CompilersPage.java b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari8CompilersPage.java index 197be8ef..7324bccd 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari8CompilersPage.java +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesAtari8CompilersPage.java @@ -19,7 +19,8 @@ package com.wudsn.ide.lng.asm.preferences; import com.wudsn.ide.base.hardware.Hardware; -import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; /** * Visual editor page for the assembler preferences regarding Atari 8-bit @@ -28,13 +29,13 @@ import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; * @author Peter Dell * */ -public final class AssemblerPreferencesAtari8CompilersPage extends AssemblerPreferencesCompilersPage { +public final class AssemblerPreferencesAtari8CompilersPage extends LanguagePreferencesCompilersPage { /** * Create is public. Used by extension point "org.eclipse.ui.preferencePages". */ public AssemblerPreferencesAtari8CompilersPage() { - super(Hardware.ATARI8BIT); + super(Language.ASM,Hardware.ATARI8BIT); } diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesC64CompilersPage.java b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesC64CompilersPage.java index 6a45199a..a304ea31 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesC64CompilersPage.java +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesC64CompilersPage.java @@ -19,7 +19,8 @@ package com.wudsn.ide.lng.asm.preferences; import com.wudsn.ide.base.hardware.Hardware; -import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; /** * Visual editor page for the assembler preferences regarding C64 compilers. @@ -27,13 +28,13 @@ import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; * @author Peter Dell * */ -public final class AssemblerPreferencesC64CompilersPage extends AssemblerPreferencesCompilersPage { +public final class AssemblerPreferencesC64CompilersPage extends LanguagePreferencesCompilersPage { /** * Create is public. Used by extension point "org.eclipse.ui.preferencePages". */ public AssemblerPreferencesC64CompilersPage() { - super(Hardware.C64); + super(Language.ASM, Hardware.C64); } diff --git a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesNESCompilersPage.java b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesNESCompilersPage.java index 5b02efc6..e1003d99 100644 --- a/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesNESCompilersPage.java +++ b/com.wudsn.ide.asm.compilers/src/com/wudsn/ide/lng/asm/preferences/AssemblerPreferencesNESCompilersPage.java @@ -19,7 +19,8 @@ package com.wudsn.ide.lng.asm.preferences; import com.wudsn.ide.base.hardware.Hardware; -import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; /** * Visual editor page for the assembler preferences regarding NES compilers. @@ -27,13 +28,13 @@ import com.wudsn.ide.lng.preferences.AssemblerPreferencesCompilersPage; * @author Peter Dell * */ -public final class AssemblerPreferencesNESCompilersPage extends AssemblerPreferencesCompilersPage { +public final class AssemblerPreferencesNESCompilersPage extends LanguagePreferencesCompilersPage { /** * Create is public. Used by extension point "org.eclipse.ui.preferencePages". */ public AssemblerPreferencesNESCompilersPage() { - super(Hardware.NES); + super(Language.ASM,Hardware.NES); } diff --git a/com.wudsn.ide.asm/OSGI-INF/l10n/bundle.properties b/com.wudsn.ide.asm/OSGI-INF/l10n/bundle.properties index 51379d94..e689e60f 100644 --- a/com.wudsn.ide.asm/OSGI-INF/l10n/bundle.properties +++ b/com.wudsn.ide.asm/OSGI-INF/l10n/bundle.properties @@ -7,11 +7,11 @@ com.wudsn.ide.lng.Hardware.C64=C64 com.wudsn.ide.lng.Hardware.NES=NES com.wudsn.ide.lng.Hardware.TEST=Test -com.wudsn.ide.lng.CPU.MOS6502=6502 -com.wudsn.ide.lng.CPU.MOS6502_ILLEGAL=6502 with illegal opcodes -com.wudsn.ide.lng.CPU.MOS65C02=65C02 -com.wudsn.ide.lng.CPU.MOS6502_DTV=6502 DTV -com.wudsn.ide.lng.CPU.MOS65816=65816 +com.wudsn.ide.lng.Target.MOS6502=6502 +com.wudsn.ide.lng.Target.MOS6502_ILLEGAL=6502 with illegal opcodes +com.wudsn.ide.lng.Target.MOS65C02=65C02 +com.wudsn.ide.lng.Target.MOS6502_DTV=6502 DTV +com.wudsn.ide.lng.Target.MOS65816=65816 com.wudsn.ide.lng.compiler.AssemblerSourceFile.name=Assembler Source File diff --git a/com.wudsn.ide.asm/OSGI-INF/l10n/bundle_de_DE.properties b/com.wudsn.ide.asm/OSGI-INF/l10n/bundle_de_DE.properties index f1cd5c6b..0e8f0a28 100644 --- a/com.wudsn.ide.asm/OSGI-INF/l10n/bundle_de_DE.properties +++ b/com.wudsn.ide.asm/OSGI-INF/l10n/bundle_de_DE.properties @@ -7,11 +7,11 @@ com.wudsn.ide.lng.Hardware.C64=C64 com.wudsn.ide.lng.Hardware.NES=NES com.wudsn.ide.lng.Hardware.TEST=Test -com.wudsn.ide.lng.CPU.MOS6502=6502 -com.wudsn.ide.lng.CPU.MOS6502_ILLEGAL=6502 mit illegalen Opcodes -com.wudsn.ide.lng.CPU.MOS65C02=65C02 -com.wudsn.ide.lng.CPU.MOS6502_DTV=6502 DTV -com.wudsn.ide.lng.CPU.MOS65816=65816 +com.wudsn.ide.lng.Target.MOS6502=6502 +com.wudsn.ide.lng.Target.MOS6502_ILLEGAL=6502 mit illegalen Opcodes +com.wudsn.ide.lng.Target.MOS65C02=65C02 +com.wudsn.ide.lng.Target.MOS6502_DTV=6502 DTV +com.wudsn.ide.lng.Target.MOS65816=65816 com.wudsn.ide.lng.compiler.AssemblerSourceFile.name=Assembler Quell-Datei diff --git a/com.wudsn.ide.asm/schema/compilers.exsd b/com.wudsn.ide.asm/schema/compilers.exsd index 182c9b3d..6512c11d 100644 --- a/com.wudsn.ide.asm/schema/compilers.exsd +++ b/com.wudsn.ide.asm/schema/compilers.exsd @@ -139,9 +139,9 @@ - + - + diff --git a/com.wudsn.ide.asm/schema/runners.exsd b/com.wudsn.ide.asm/schema/runners.exsd new file mode 100644 index 00000000..3d3990c4 --- /dev/null +++ b/com.wudsn.ide.asm/schema/runners.exsd @@ -0,0 +1,144 @@ + + + + + + + + + This extension point allows for adding new runner, for example runners, to the WUDSN IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Optional implementation class to provide runner specific breakouts, for example for creating breakpoint files. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WUDSN IDE 1.3.0 + + + + + + + + + + + + (c) 2009 Peter Dell + + + + diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/HardwareUtility.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/HardwareUtility.java index 627bc3e2..89772621 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/HardwareUtility.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/HardwareUtility.java @@ -27,6 +27,7 @@ import com.wudsn.ide.lng.compiler.writer.AppleFileWriter; * * @author Peter Dell * + * TODO: Move to right place/class */ public final class HardwareUtility { diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Language.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Language.java new file mode 100644 index 00000000..3f6918a4 --- /dev/null +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Language.java @@ -0,0 +1,30 @@ +/** + * Copyright (C) 2009 - 2021 Peter Dell + * + * This file is part of WUDSN IDE. + * + * WUDSN IDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * WUDSN IDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WUDSN IDE. If not, see . + */ +package com.wudsn.ide.lng; + +/** + * Enum for the hardware platforms. + * + * @author Peter Dell + * + */ +public enum Language { + + ASM, PAS +} diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/CPU.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Target.java similarity index 95% rename from com.wudsn.ide.asm/src/com/wudsn/ide/lng/CPU.java rename to com.wudsn.ide.asm/src/com/wudsn/ide/lng/Target.java index 5098d641..a5e534cd 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/CPU.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Target.java @@ -25,7 +25,7 @@ package com.wudsn.ide.lng; * * @since 1.6.1 */ -public enum CPU { +public enum Target { MOS6502, MOS6502_ILLEGAL, MOS65C02, MOS6502_DTV, MOS65816 } diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts.java index 8a997b52..b735e59a 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts.java @@ -170,7 +170,7 @@ public final class Texts extends NLS { /** * Preferences: compiler. */ - public static String PREFERENCES_COMPILER_CPU_LABEL; + public static String PREFERENCES_COMPILER_TARGET_LABEL; public static String PREFERENCES_COMPILER_EXECUTABLE_PATH_LABEL; public static String PREFERENCES_COMPILER_HARDWARE_ACTIVE_LABEL; diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts.properties b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts.properties index 6dd13a77..169a0a93 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts.properties +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts.properties @@ -89,7 +89,7 @@ PREFERENCES_ITALIC_LABEL=&Italic PREFERENCES_DOWNLOAD_LINK=Download PREFERENCES_DOWNLOAD_LINK_TOOL_TIP=Open download page {0} -PREFERENCES_COMPILER_CPU_LABEL=CP&U +PREFERENCES_COMPILER_TARGET_LABEL=&Target PREFERENCES_COMPILER_EXECUTABLE_PATH_LABEL=Path to &Compiler PREFERENCES_COMPILER_HARDWARE_ACTIVE_LABEL=Use for {0} PREFERENCES_COMPILER_DEFAULT_PARAMETERS_LABEL=&Default Parameters @@ -119,7 +119,7 @@ TOC_ASSEMBLER_GENERAL_TOPIC_LABEL=General TOC_ASSEMBLER_NAME_LABEL=Name TOC_ASSEMBLER_HOME_PAGE_LABEL=Home Page TOC_ASSEMBLER_DEFAULT_HARDWARE_LABEL=Default Hardware -TOC_ASSEMBLER_SUPPORTED_CPUS_LABEL=Supported CPUs +TOC_ASSEMBLER_SUPPORTED_TARGETS_LABEL=Supported Targets TOC_ASSEMBLER_DEFAULT_PARAMETERS_LABEL=Default Parameters TOC_ASSEMBLER_INSTRUCTIONS_TOPIC_LABEL=Instructions TOC_ASSEMBLER_INSTRUCTION_TYPE_DIRECTIVES_LABEL=Directives @@ -156,9 +156,9 @@ TOC_HARDWARE_EMULATOR_LABEL=Emulator TOC_HARDWARE_HOME_PAGE_LABEL=Home Page TOC_HARDWARE_DEFAULT_PARAMETERS_LABEL=Default Parameters -TOC_CPUS_TOPIC_LABEL=CPUs -TOC_CPU_NAME_LABEL=CPU -TOC_CPU_OPCODE_LABEL=Opcode +TOC_TARGETS_TOPIC_LABEL=Targets +TOC_TARGETS_NAME_LABEL=Target +TOC_TARGET_OPCODE_LABEL=Opcode MESSAGE_E100=Path to '{0}' compiler executable is not set in the 'Assembler' preferences. MESSAGE_E101=The compiler '{0}' does not specify default parameters. diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts_de_DE.properties b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts_de_DE.properties index ad857909..cb9564e5 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts_de_DE.properties +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/Texts_de_DE.properties @@ -87,7 +87,7 @@ PREFERENCES_ITALIC_LABEL=&Kursiv PREFERENCES_DOWNLOAD_LINK=Download PREFERENCES_DOWNLOAD_LINK_TOOL_TIP=Webseite {0} für Download öffnen -PREFERENCES_COMPILER_CPU_LABEL=CP&U +PREFERENCES_COMPILER_TARGET_LABEL=&Ziel PREFERENCES_COMPILER_EXECUTABLE_PATH_LABEL=Pfad zum &Kompiler PREFERENCES_COMPILER_HARDWARE_ACTIVE_LABEL=Verwenden für {0} PREFERENCES_COMPILER_DEFAULT_PARAMETERS_LABEL=&Standardparameter @@ -117,7 +117,7 @@ TOC_ASSEMBLER_GENERAL_TOPIC_LABEL=Allgemein TOC_ASSEMBLER_NAME_LABEL=Name TOC_ASSEMBLER_HOME_PAGE_LABEL=Home Page TOC_ASSEMBLER_DEFAULT_HARDWARE_LABEL=Standardhardware -TOC_ASSEMBLER_SUPPORTED_CPUS_LABEL=Unterstütze CPUs +TOC_ASSEMBLER_SUPPORTED_TARGETS_LABEL=Unterstütze Ziele TOC_ASSEMBLER_DEFAULT_PARAMETERS_LABEL=Standardparameter TOC_ASSEMBLER_INSTRUCTIONS_TOPIC_LABEL=Befehle TOC_ASSEMBLER_INSTRUCTION_TYPE_DIRECTIVES_LABEL=Direktiven @@ -154,9 +154,9 @@ TOC_HARDWARE_EMULATOR_LABEL=Emulator TOC_HARDWARE_HOME_PAGE_LABEL=Home Page TOC_HARDWARE_DEFAULT_PARAMETERS_LABEL=Standardparameter -TOC_CPUS_TOPIC_LABEL=CPUs -TOC_CPU_NAME_LABEL=CPU -TOC_CPU_OPCODE_LABEL=Opcode +TOC_TARGETS_TOPIC_LABEL=Ziele +TOC_TARGET_NAME_LABEL=Ziel +TOC_TARGET_OPCODE_LABEL=Opcode MESSAGE_E100=Pfad zur ausführbaren Datei des Kompilers '{0}' ist in den 'Assembler' Voreinstellungen nicht angegeben. MESSAGE_E101=Der Kompiler '{0}' definiert keine Standardparameter. diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/Compiler.xml b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/Compiler.xml index 9ca3c1ab..4908df16 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/Compiler.xml +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/Compiler.xml @@ -4,110 +4,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/CompilerDefinition.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/CompilerDefinition.java index 0656bd3d..4178d83c 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/CompilerDefinition.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/CompilerDefinition.java @@ -33,7 +33,7 @@ import com.wudsn.ide.base.common.StringUtility; import com.wudsn.ide.base.common.TextUtility; import com.wudsn.ide.base.hardware.Hardware; import com.wudsn.ide.lng.AssemblerPlugin; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; import com.wudsn.ide.lng.Texts; import com.wudsn.ide.lng.compiler.syntax.CompilerSyntax; @@ -56,7 +56,7 @@ public final class CompilerDefinition implements Comparable private String homePageURL; // Editing and source parsing. - private List supportedCPUs; + private List supportedCPUs; private CompilerSyntax syntax; // Compiling. @@ -299,7 +299,7 @@ public final class CompilerDefinition implements Comparable * not null. * @since 1.6.1 */ - final void setSupportedCPUs(List supportedCPUs) { + final void setSupportedCPUs(List supportedCPUs) { if (supportedCPUs == null) { throw new IllegalArgumentException("Parameter 'supportedCPUs' must not be null."); } @@ -311,14 +311,14 @@ public final class CompilerDefinition implements Comparable /** * Gets the unmodifiable list of CPUs supported by this compiler. The first - * entry defines the default CPU. + * entry defines the default Target. * * @return The unmodifiable list of CPUs supported by this compiler, not empty * and, not null. * * @since 1.6.1 */ - public final List getSupportedCPUs() { + public final List getSupportedTargets() { if (supportedCPUs == null) { throw new IllegalStateException("Field 'supportedCPUs' must not be null."); } diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/CompilerRegistry.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/CompilerRegistry.java index a200fa31..7ca4b459 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/CompilerRegistry.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/CompilerRegistry.java @@ -33,7 +33,7 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import com.wudsn.ide.base.hardware.Hardware; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; import com.wudsn.ide.lng.compiler.syntax.CompilerSyntax; /** @@ -100,14 +100,14 @@ public final class CompilerRegistry { compilerDefinition.setDefaultParameters(configurationElement.getAttribute("defaultParameters")); configurationElement.getChildren("supportedCPU"); - IConfigurationElement[] supportedCPUArray; - supportedCPUArray = configurationElement.getChildren("supportedCPU"); - List supportedCPUs = new ArrayList(supportedCPUArray.length); - for (IConfigurationElement supportedCPU : supportedCPUArray) { - supportedCPUs.add(CPU.valueOf(supportedCPU.getAttribute("cpu"))); + IConfigurationElement[] supportedTargetsArray; + supportedTargetsArray = configurationElement.getChildren("supportedCPU"); + List supportedTargets = new ArrayList(supportedTargetsArray.length); + for (IConfigurationElement supportedCPU : supportedTargetsArray) { + supportedTargets.add(Target.valueOf(supportedCPU.getAttribute("target"))); } - supportedCPUs = Collections.unmodifiableList(supportedCPUs); - compilerDefinition.setSupportedCPUs(supportedCPUs); + supportedTargets = Collections.unmodifiableList(supportedTargets); + compilerDefinition.setSupportedCPUs(supportedTargets); compilerDefinition .setDefaultHardware(Hardware.valueOf(configurationElement.getAttribute("defaultHardware"))); diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/parser/CompilerSourceParser.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/parser/CompilerSourceParser.java index 199ae34d..c86e6d8b 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/parser/CompilerSourceParser.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/parser/CompilerSourceParser.java @@ -141,7 +141,7 @@ public abstract class CompilerSourceParser { } /** - * Gets the instruction for the currently active CPU. + * Gets the instruction for the currently active Target. * * @return The instruction set, not null. * diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/CompilerSyntax.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/CompilerSyntax.java index da5e9813..ab720811 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/CompilerSyntax.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/CompilerSyntax.java @@ -40,7 +40,7 @@ import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; import com.wudsn.ide.base.common.StringUtility; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; import com.wudsn.ide.lng.compiler.CompilerRegistry; /** @@ -242,8 +242,8 @@ public final class CompilerSyntax { } else { // Begin parsing of instructions. - String cpusString; - Set cpus; + String targetsString; + Set targets; String name; String title; String proposal; @@ -255,12 +255,12 @@ public final class CompilerSyntax { throw new SAXException("No name specified for '" + qName + "'."); } - cpusString = attributes.getValue("cpus"); - if (cpusString == null) { - throw new SAXException("No CPUs specified for '" + name + "'."); + targetsString = attributes.getValue("targets"); + if (targetsString == null) { + throw new SAXException("No targets specified for '" + name + "'."); } - cpus = new TreeSet(); - StringTokenizer tokenizer = new StringTokenizer(cpusString, ","); + targets = new TreeSet(); + StringTokenizer tokenizer = new StringTokenizer(targetsString, ","); while (tokenizer.hasMoreTokens()) { String token = tokenizer.nextToken(); boolean found = false; @@ -268,23 +268,24 @@ public final class CompilerSyntax { // Wild card? if (token.endsWith("*")) { token = token.substring(0, token.length() - 1); - for (CPU cpu : CPU.values()) { - if (cpu.name().startsWith(token) || cpu == CPU.MOS65C02 && token.equals("MOS6502")) { - cpus.add(cpu); + for (Target target : Target.values()) { + // TODO: Why special logic here for MOS65C02? + if (target.name().startsWith(token) || target == Target.MOS65C02 && token.equals("MOS6502")) { + targets.add(target); found = true; } } } else { // Exact match - for (CPU cpu : CPU.values()) { - if (cpu.name().equals(token)) { - cpus.add(cpu); + for (Target target : Target.values()) { + if (target.name().equals(token)) { + targets.add(target); found = true; } } } if (!found) { - throw new SAXException("No cpu matches the cpus '" + cpusString + "' for '" + name + "'."); + throw new SAXException("No target matches the target '" + targetsString + "' for '" + name + "'."); } } @@ -359,7 +360,7 @@ public final class CompilerSyntax { throw new SAXException( "Unknown directive type '" + typeString + "' for directive '" + name + "'."); } - instructionsList.add(new Directive(cpus, type, instructionsCaseSensitive, name, title, proposal)); + instructionsList.add(new Directive(targets, type, instructionsCaseSensitive, name, title, proposal)); } else if (qName.equals("opcode") || qName.equals("illegalopcode") || qName.equals("pseudoopcode")) { if (qName.equals("opcode")) { @@ -389,8 +390,8 @@ public final class CompilerSyntax { name = name.toLowerCase(); proposal = proposal.toLowerCase(); } - instructionsList.add(new Opcode(cpus, type, instructionsCaseSensitive, name, title, proposal, - cpus.contains(CPU.MOS65816), flags, modes)); + instructionsList.add(new Opcode(targets, type, instructionsCaseSensitive, name, title, proposal, + targets.contains(Target.MOS65816), flags, modes)); } } } @@ -429,7 +430,7 @@ public final class CompilerSyntax { private String sourceIncludeDefaultExtension; private List instructionList; - private Map instructionSets; + private Map instructionSets; /** * Creates new instance. Called by {@link CompilerRegistry}. @@ -615,7 +616,7 @@ public final class CompilerSyntax { instructionList = Collections.unmodifiableList(xmlHandler.instructionsList); // Create instruction set map. - instructionSets = new TreeMap(); + instructionSets = new TreeMap(); } static boolean[] createBooleanArray(String string) { @@ -895,25 +896,25 @@ public final class CompilerSyntax { } /** - * Gets the instruction set for a CPU. + * Gets the instruction set for a Target. * - * @param cpu The CPU this which the allowed list of instructions shall be + * @param target The Target this which the allowed list of instructions shall be * returned, not null. * @return The set of instructions supported by the compiler for the specified - * CPU, not null. + * Target, not null. * * @since 1.6.1 */ - public InstructionSet getInstructionSet(CPU cpu) { - if (cpu == null) { - throw new IllegalArgumentException("Parameter 'cpu' must not be null."); + public InstructionSet getInstructionSet(Target target) { + if (target == null) { + throw new IllegalArgumentException("Parameter 'target' must not be null."); } InstructionSet result; synchronized (instructionSets) { - result = instructionSets.get(cpu); + result = instructionSets.get(target); if (result == null) { - result = new InstructionSet(this, instructionList, cpu); - instructionSets.put(cpu, result); + result = new InstructionSet(this, instructionList, target); + instructionSets.put(target, result); } } diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Directive.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Directive.java index 3522ad89..1d0b0a6e 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Directive.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Directive.java @@ -21,11 +21,11 @@ package com.wudsn.ide.lng.compiler.syntax; import java.util.Set; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; public final class Directive extends Instruction { - Directive(Set cpus, int type, boolean caseSensitive, String name, String title, String proposal) { + Directive(Set cpus, int type, boolean caseSensitive, String name, String title, String proposal) { super(cpus, type, caseSensitive, name, title, proposal); switch (type) { diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Instruction.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Instruction.java index 2912ac6d..b1f323ec 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Instruction.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Instruction.java @@ -24,14 +24,14 @@ import java.util.List; import java.util.Set; import com.wudsn.ide.base.common.NumberFactory; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; public abstract class Instruction implements Comparable { public static final char CURSOR = '_'; public static final char NEWLINE = '\n'; - private Set cpus; + private Set cpus; private int type; private String name; private String upperCaseName; @@ -42,7 +42,7 @@ public abstract class Instruction implements Comparable { private int[] styledTitleOffsets; private String proposal; - protected Instruction(Set cpus, int type, boolean caseSensitive, String name, String title, String proposal) { + protected Instruction(Set cpus, int type, boolean caseSensitive, String name, String title, String proposal) { if (cpus == null) { throw new IllegalArgumentException("Parameter 'cpus' must not be null."); } @@ -130,7 +130,7 @@ public abstract class Instruction implements Comparable { } } - public Set getCPUs() { + public Set getCPUs() { return cpus; } diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/InstructionSet.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/InstructionSet.java index 9221724c..503f9b1d 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/InstructionSet.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/InstructionSet.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; import com.wudsn.ide.lng.compiler.CompilerRegistry; import com.wudsn.ide.lng.compiler.syntax.Opcode.OpcodeAddressingMode; @@ -64,9 +64,9 @@ public final class InstructionSet { * @param compilerSyntax The compiler syntax, not null. * * @param instructionsList The non-filtered list of compiler instructions. - * @param cpu The cpu to filter by, not null. + * @param target The target to filter by, not null. */ - InstructionSet(CompilerSyntax compilerSyntax, List instructionsList, CPU cpu) { + InstructionSet(CompilerSyntax compilerSyntax, List instructionsList, Target target) { if (compilerSyntax == null) { throw new IllegalArgumentException("Parameter 'compilerSyntax' must not be null."); @@ -74,8 +74,8 @@ public final class InstructionSet { if (instructionsList == null) { throw new IllegalArgumentException("Parameter 'instructionsList' must not be null."); } - if (cpu == null) { - throw new IllegalArgumentException("Parameter 'cpu' must not be null."); + if (target == null) { + throw new IllegalArgumentException("Parameter 'target' must not be null."); } // Compute the list of all include instructions. this.compilerSyntax = compilerSyntax; @@ -94,7 +94,7 @@ public final class InstructionSet { StringBuilder instructionPartCharacters = new StringBuilder(2048); for (Instruction instruction : instructionsList) { - if (!instruction.getCPUs().contains(cpu)) { + if (!instruction.getCPUs().contains(target)) { continue; } this.instructionsList.add(instruction); @@ -121,8 +121,8 @@ public final class InstructionSet { Opcode opcode = (Opcode) instruction; for (OpcodeAddressingMode opcodeAddressingMode : opcode.getAddressingModes()) { // Even if an instruction is supported by all CPUs, not all - // addressing modes may be supported by the CPU, - if (opcodeAddressingMode.getCPUs().contains(cpu)) { + // addressing modes may be supported by the Target, + if (opcodeAddressingMode.getCPUs().contains(target)) { List list = opcodeAddessingModesList .get(opcodeAddressingMode.getOpcodeValue()); if (list == null) { @@ -212,7 +212,7 @@ public final class InstructionSet { /** * Gets list of opcode address modes for the given opcode value. Only instances - * that are support by the CPU of the instruction set are returned. + * that are support by the Target of the instruction set are returned. * * @param opcodeValue The opcode value. * @return The list of opcode address modes, may be empty, not diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Opcode.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Opcode.java index 09abfb25..20ff1db4 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Opcode.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/compiler/syntax/Opcode.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; public final class Opcode extends Instruction { @@ -32,11 +32,11 @@ public final class Opcode extends Instruction { public final static class OpcodeAddressingMode { private Opcode opcode; - private Set cpus; + private Set cpus; private String addressingMode; private int opcodeValue; - OpcodeAddressingMode(Opcode opcode, Set cpus, String addressingMode, int opcodeValue) { + OpcodeAddressingMode(Opcode opcode, Set cpus, String addressingMode, int opcodeValue) { if (opcode == null) { throw new IllegalArgumentException("Parameter 'opcode' must not be null."); } @@ -63,7 +63,7 @@ public final class Opcode extends Instruction { return opcode; } - public Set getCPUs() { + public Set getCPUs() { return cpus; } @@ -133,7 +133,7 @@ public final class Opcode extends Instruction { private String modes; private List addressingModes; - Opcode(Set cpus, int type, boolean instructionsCaseSensitive, String name, String title, String proposal, + Opcode(Set cpus, int type, boolean instructionsCaseSensitive, String name, String title, String proposal, boolean w65816, String flags, String modes) { super(cpus, type, instructionsCaseSensitive, name, title, proposal); @@ -157,7 +157,7 @@ public final class Opcode extends Instruction { this.flags = flags; this.modes = modes; addressingModes = new ArrayList(); - Set addressingModeCPUs = cpus; + Set addressingModeCPUs = cpus; for (String mode : modes.split(",")) { mode = mode.trim(); String values[] = mode.split("="); @@ -167,9 +167,9 @@ public final class Opcode extends Instruction { if (index >= 0) { String[] cpuNameList = value.substring(index + 1, value.length() - 1).split(";"); value = value.substring(0, index); - addressingModeCPUs = new TreeSet(); + addressingModeCPUs = new TreeSet(); for (String cpuName : cpuNameList) { - addressingModeCPUs.add(CPU.valueOf(cpuName)); + addressingModeCPUs.add(Target.valueOf(cpuName)); } } int opcode = Integer.parseInt(value, 16); diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/editor/AssemblerEditor.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/editor/AssemblerEditor.java index 5395b78b..8b18e922 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/editor/AssemblerEditor.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/editor/AssemblerEditor.java @@ -57,7 +57,7 @@ import com.wudsn.ide.base.common.Profiler; import com.wudsn.ide.base.hardware.Hardware; import com.wudsn.ide.lng.AssemblerPlugin; import com.wudsn.ide.lng.AssemblerProperties; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; import com.wudsn.ide.lng.AssemblerProperties.InvalidAssemblerPropertyException; import com.wudsn.ide.lng.compiler.Compiler; import com.wudsn.ide.lng.compiler.CompilerDefinition; @@ -189,14 +189,14 @@ public abstract class AssemblerEditor extends TextEditor { * @return The compiler source parser for this editor, not null . */ public final CompilerSourceParser createCompilerSourceParser() { - CPU cpu; + Target target; CompilerSourceParser result; if (compiler == null) { throw new IllegalStateException("Field 'compiler' must not be null."); } - cpu = getCompilerPreferences().getCPU(); + target = getCompilerPreferences().getTarget(); result = compiler.createSourceParser(); - result.init(compiler.getDefinition().getSyntax().getInstructionSet(cpu)); + result.init(compiler.getDefinition().getSyntax().getInstructionSet(target)); return result; } diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/editor/AssemblerSourceScanner.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/editor/AssemblerSourceScanner.java index 79adc371..6a7be8de 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/editor/AssemblerSourceScanner.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/editor/AssemblerSourceScanner.java @@ -501,7 +501,7 @@ final class AssemblerSourceScanner extends RuleBasedScanner { token.setData(preferences.getEditorTextAttribute(propertyName)); refresh = true; - } else if (AssemblerPreferencesConstants.isCompilerCPUName(propertyName)) { + } else if (AssemblerPreferencesConstants.isCompilerTargetName(propertyName)) { CompilerSourceParser compilerSourceParser = editor.createCompilerSourceParser(); wordRule.setCompilerSourceParser(compilerSourceParser); wordRule.setInstructions(); diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/help/AssemblerHelpContentProducer.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/help/AssemblerHelpContentProducer.java index 6f6c5c67..28faa639 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/help/AssemblerHelpContentProducer.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/help/AssemblerHelpContentProducer.java @@ -49,7 +49,7 @@ import com.wudsn.ide.base.common.TextUtility; import com.wudsn.ide.base.hardware.Hardware; import com.wudsn.ide.base.hardware.HardwareUtility; import com.wudsn.ide.lng.AssemblerPlugin; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; import com.wudsn.ide.lng.Texts; import com.wudsn.ide.lng.compiler.Compiler; import com.wudsn.ide.lng.compiler.CompilerDefinition; @@ -99,7 +99,7 @@ public final class AssemblerHelpContentProducer implements IHelpContentProducer public static final String SECTION_MANUAL = "manual"; public static final String SECTION_MANUAL_FILE = "file"; - public static final String SCHEMA_CPU = "cpu/"; + public static final String SCHEMA_TARGET = "target/"; private static final String ICONS_PATH = "/help/topic/com.wudsn.ide.lng/icons/"; @@ -114,7 +114,7 @@ public final class AssemblerHelpContentProducer implements IHelpContentProducer return getCompilerInputStream(href); } else if (href.startsWith(SCHEMA_HARDWARE)) { return getHardwareInputStream(href); - } else if (href.startsWith(SCHEMA_CPU)) { + } else if (href.startsWith(SCHEMA_TARGET)) { return getCPUInputStream(href); } else if (href.endsWith(".html")) { // Web site documents return getHTMLInputStream(href); @@ -338,7 +338,7 @@ public final class AssemblerHelpContentProducer implements IHelpContentProducer writer.writeTableRow(Texts.TOC_ASSEMBLER_DEFAULT_HARDWARE_LABEL, HTMLWriter .getImage(ICONS_PATH + HardwareUtility.getImagePath(hardware), hardware.name(), hardware.name())); - List cpus = compilerDefinition.getSupportedCPUs(); + List cpus = compilerDefinition.getSupportedTargets(); writer.beginTableRow(); writer.writeTableHeader(Texts.TOC_ASSEMBLER_SUPPORTED_CPUS_LABEL); StringBuilder builder = new StringBuilder(); @@ -437,9 +437,9 @@ public final class AssemblerHelpContentProducer implements IHelpContentProducer List pseudoOpcodes = new ArrayList(); List w65816Opcodes = new ArrayList(); - List cpus = compilerDefinition.getSupportedCPUs(); - for (CPU cpu : cpus) { - for (Instruction instruction : syntax.getInstructionSet(cpu).getInstructions()) { + List cpus = compilerDefinition.getSupportedTargets(); + for (Target target : cpus) { + for (Instruction instruction : syntax.getInstructionSet(target).getInstructions()) { if (instruction instanceof Directive) { if (!directives.contains(instruction)) { @@ -598,19 +598,19 @@ public final class AssemblerHelpContentProducer implements IHelpContentProducer if (href == null) { throw new IllegalArgumentException("Parameter 'href' must not be null."); } - String path = getPath(SCHEMA_CPU, href); + String path = getPath(SCHEMA_TARGET, href); if (path == null) { return null; } - CPU cpu = CPU.valueOf(path.toUpperCase()); + Target target = Target.valueOf(path.toUpperCase()); AssemblerPlugin assemblerPlugin = AssemblerPlugin.getInstance(); CompilerRegistry compilerRegistry = assemblerPlugin.getCompilerRegistry(); HTMLWriter writer = createHeader(); writer.beginTable(); - writer.writeTableRow(Texts.TOC_CPU_NAME_LABEL, EnumUtility.getText(cpu)); + writer.writeTableRow(Texts.TOC_CPU_NAME_LABEL, EnumUtility.getText(target)); writer.end(); writer.begin("br", null); @@ -627,7 +627,7 @@ public final class AssemblerHelpContentProducer implements IHelpContentProducer InstructionSet[] instructionSets = new InstructionSet[compilerDefinitions.size()]; for (int c = 0; c < compilerDefinitionCount; c++) { CompilerDefinition compilerDefinition = compilerDefinitions.get(c); - instructionSets[c] = compilerDefinition.getSyntax().getInstructionSet(cpu); + instructionSets[c] = compilerDefinition.getSyntax().getInstructionSet(target); writer.writeTableHeader(compilerDefinition.getName()); } diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/help/AssemblerTocProvider.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/help/AssemblerTocProvider.java index d6bc2e1a..026c3032 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/help/AssemblerTocProvider.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/help/AssemblerTocProvider.java @@ -40,7 +40,7 @@ import org.eclipse.help.IUAElement; import com.wudsn.ide.base.common.EnumUtility; import com.wudsn.ide.base.hardware.Hardware; import com.wudsn.ide.lng.AssemblerPlugin; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; import com.wudsn.ide.lng.Texts; import com.wudsn.ide.lng.compiler.CompilerDefinition; import com.wudsn.ide.lng.compiler.CompilerRegistry; @@ -346,11 +346,11 @@ public final class AssemblerTocProvider extends AbstractTocProvider { } private static List createCPUTopics() { - List cpuTopics = new ArrayList(CPU.values().length - 1); - for (CPU cpu : CPU.values()) { - String href = AssemblerHelpContentProducer.SCHEMA_CPU + cpu.name().toLowerCase() + List cpuTopics = new ArrayList(Target.values().length - 1); + for (Target target : Target.values()) { + String href = AssemblerHelpContentProducer.SCHEMA_TARGET + target.name().toLowerCase() + AssemblerHelpContentProducer.EXTENSION; - cpuTopics.add(createTopic("", EnumUtility.getText(cpu), href, null)); + cpuTopics.add(createTopic("", EnumUtility.getText(target), href, null)); } return cpuTopics; } diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/AssemblerPreferencesConstants.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/AssemblerPreferencesConstants.java index ff072057..fba81cb0 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/AssemblerPreferencesConstants.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/AssemblerPreferencesConstants.java @@ -147,18 +147,18 @@ public final class AssemblerPreferencesConstants { } /** - * Determines if preference key name represents a setting for compiler opcodes + * Determines if preference key name represents a setting for compiler targets * visibility. * * @param name The name of the preferences key, not null. * @return true if preference key name represents a setting for * compiler opcodes visibility, false otherwise. */ - public static boolean isCompilerCPUName(String name) { + public static boolean isCompilerTargetName(String name) { if (name == null) { throw new IllegalArgumentException("Parameter 'name' must not be null."); } - boolean result = name.startsWith("compiler.") && name.endsWith(".cpu"); + boolean result = name.startsWith("compiler.") && name.endsWith(".target"); return result; } @@ -180,22 +180,22 @@ public final class AssemblerPreferencesConstants { } /** - * Gets preference key name for the compiler CPU visibility. + * Gets preference key name for the compiler Target visibility. * * @param compilerId The compiler id, not null. * @param hardware The hardware, not null. * - * @return The preference key name for the compiler CPU, not empty and not + * @return The preference key name for the compiler Target, not empty and not * null. */ - static String getCompilerCPUName(String compilerId, Hardware hardware) { + static String getCompilerTargetName(String compilerId, Hardware hardware) { if (compilerId == null) { throw new IllegalArgumentException("Parameter 'compilerId' must not be null."); } if (hardware == null) { throw new IllegalArgumentException("Parameter 'hardware' must not be null."); } - return getCompilerHardwarePrefix(compilerId, hardware) + ".cpu"; //$NON-NLS-1$ + return getCompilerHardwarePrefix(compilerId, hardware) + ".target"; //$NON-NLS-1$ } /** diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/AssemblerPreferencesInitializer.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/AssemblerPreferencesInitializer.java index ca2b7f72..b7456326 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/AssemblerPreferencesInitializer.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/AssemblerPreferencesInitializer.java @@ -123,8 +123,8 @@ public final class AssemblerPreferencesInitializer extends AbstractPreferenceIni if (hardware.equals(Hardware.GENERIC)) { continue; } - store.setDefault(AssemblerPreferencesConstants.getCompilerCPUName(compilerId, hardware), - compilerDefinition.getSupportedCPUs().get(0).toString()); + store.setDefault(AssemblerPreferencesConstants.getCompilerTargetName(compilerId, hardware), + compilerDefinition.getSupportedTargets().get(0).toString()); name = AssemblerPreferencesConstants.getCompilerParametersName(compilerId, hardware); store.setDefault(name, compilerDefinition.getDefaultParameters()); diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/CompilerPreferences.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/CompilerPreferences.java index 0b325475..4f779770 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/CompilerPreferences.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/CompilerPreferences.java @@ -21,7 +21,7 @@ package com.wudsn.ide.lng.preferences; import com.wudsn.ide.base.common.StringUtility; import com.wudsn.ide.base.hardware.Hardware; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; import com.wudsn.ide.lng.compiler.CompilerOutputFolderMode; import com.wudsn.ide.lng.runner.RunnerId; @@ -76,21 +76,21 @@ public final class CompilerPreferences { } /** - * Gets the CPU for which the instructions shall be active. + * Gets the Target for which the instructions shall be active. * - * @return The CPU, not null. + * @return The Target, not null. * * @since 1.6.1 */ - public CPU getCPU() { - CPU result; - String cpuString = assemblerPreferences - .getString(AssemblerPreferencesConstants.getCompilerCPUName(compilerId, hardware)); + public Target getTarget() { + Target result; + String targetString = assemblerPreferences + .getString(AssemblerPreferencesConstants.getCompilerTargetName(compilerId, hardware)); - if (StringUtility.isEmpty(cpuString)) { - result = CPU.MOS6502; + if (StringUtility.isEmpty(targetString)) { + result = Target.MOS6502; } else { - result = CPU.valueOf(cpuString); + result = Target.valueOf(targetString); } return result; } @@ -102,7 +102,7 @@ public final class CompilerPreferences { */ @Deprecated public boolean isIllegalOpcodesVisible() { - return getCPU() == CPU.MOS6502_ILLEGAL; + return getTarget() == Target.MOS6502_ILLEGAL; } /** @@ -112,7 +112,7 @@ public final class CompilerPreferences { */ @Deprecated public boolean isW65816OpcodesVisible() { - return getCPU() == CPU.MOS65816; + return getTarget() == Target.MOS65816; } /** diff --git a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/AssemblerPreferencesCompilersPage.java b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/LanguagePreferencesCompilersPage.java similarity index 92% rename from com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/AssemblerPreferencesCompilersPage.java rename to com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/LanguagePreferencesCompilersPage.java index 3328a1cc..c0621791 100644 --- a/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/AssemblerPreferencesCompilersPage.java +++ b/com.wudsn.ide.asm/src/com/wudsn/ide/lng/preferences/LanguagePreferencesCompilersPage.java @@ -20,6 +20,7 @@ package com.wudsn.ide.lng.preferences; import java.util.ArrayList; +import com.wudsn.ide.lng.Language; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -55,7 +56,7 @@ import com.wudsn.ide.base.common.TextUtility; import com.wudsn.ide.base.gui.SWTFactory; import com.wudsn.ide.base.hardware.Hardware; import com.wudsn.ide.lng.AssemblerPlugin; -import com.wudsn.ide.lng.CPU; +import com.wudsn.ide.lng.Target; import com.wudsn.ide.lng.Texts; import com.wudsn.ide.lng.compiler.CompilerDefinition; import com.wudsn.ide.lng.compiler.CompilerOutputFolderMode; @@ -66,13 +67,13 @@ import com.wudsn.ide.lng.runner.RunnerId; import com.wudsn.ide.lng.runner.RunnerRegistry; /** - * Visual editor page for the assembler preferences regarding compilers. There + * Visual editor page for the language preferences regarding compilers. There * is a separate page per {@link Hardware}. Subclasses only implement the * constructor. * * @author Peter Dell */ -public abstract class AssemblerPreferencesCompilersPage extends FieldEditorPreferencePage +public abstract class LanguagePreferencesCompilersPage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { private static final class Tab { @@ -165,6 +166,11 @@ public abstract class AssemblerPreferencesCompilersPage extends FieldEditorPrefe } + /** + * The language. + */ + final Language langauge; + /** * The type of hardware used to filter the compilers and emulators. */ @@ -193,11 +199,15 @@ public abstract class AssemblerPreferencesCompilersPage extends FieldEditorPrefe * @param hardware The type of hardware used to filter the compilers and * emulators, not null. */ - protected AssemblerPreferencesCompilersPage(Hardware hardware) { + protected LanguagePreferencesCompilersPage(Language language, Hardware hardware) { super(GRID); + if (language == null) { + throw new IllegalArgumentException("Parameter 'language' must not be null."); + } if (hardware == null) { throw new IllegalArgumentException("Parameter 'hardware' must not be null."); } + this.langauge = language; this.hardware = hardware; plugin = AssemblerPlugin.getInstance(); IPreferenceStore preferencesStore = plugin.getPreferenceStore(); @@ -311,25 +321,25 @@ public abstract class AssemblerPreferencesCompilersPage extends FieldEditorPrefe Composite composite; - // Field: cpu + // Field: target composite = SWTFactory.createComposite(tabContent, 2, 3, GridData.FILL_HORIZONTAL); - // Filtering of CPU based on hardware is currently not implemented + // Filtering of Target based on hardware is currently not implemented // because expansion boards like a W65816 board might be there/added // for a hardware. - List cpus = compilerDefinition.getSupportedCPUs(); - String[][] entryNamesAndValues = new String[cpus.size()][]; + List targets = compilerDefinition.getSupportedTargets(); + String[][] entryNamesAndValues = new String[targets.size()][]; int i = 0; - for (CPU cpu : cpus) { + for (Target target : targets) { entryNamesAndValues[i] = new String[2]; - entryNamesAndValues[i][1] = cpu.name(); - entryNamesAndValues[i][0] = EnumUtility.getText(cpu); + entryNamesAndValues[i][1] = target.name(); + entryNamesAndValues[i][0] = EnumUtility.getText(target); i++; } FieldEditor comboFieldEditor = new ComboFieldEditor( - AssemblerPreferencesConstants.getCompilerCPUName(compilerId, hardware), - Texts.PREFERENCES_COMPILER_CPU_LABEL, entryNamesAndValues, composite); + AssemblerPreferencesConstants.getCompilerTargetName(compilerId, hardware), + Texts.PREFERENCES_COMPILER_TARGET_LABEL, entryNamesAndValues, composite); comboFieldEditor.setEnabled(entryNamesAndValues.length > 1, composite); addField(comboFieldEditor); diff --git a/com.wudsn.ide.base/src/com/wudsn/ide/base/common/EnumUtility.java b/com.wudsn.ide.base/src/com/wudsn/ide/base/common/EnumUtility.java index 67dc8b2a..717d39b8 100644 --- a/com.wudsn.ide.base/src/com/wudsn/ide/base/common/EnumUtility.java +++ b/com.wudsn.ide.base/src/com/wudsn/ide/base/common/EnumUtility.java @@ -52,7 +52,7 @@ public final class EnumUtility { try { ResourceBundle resourceBundle; - resourceBundle = ResourceBundle.getBundle("plugin", Locale.getDefault(), enumClass.getClassLoader()); + resourceBundle = ResourceBundle.getBundle("OSGI-INF/l10n/bundle", Locale.getDefault(), enumClass.getClassLoader()); result = resourceBundle.getString(key); } catch (MissingResourceException ex) { result = enumValue.name() + " - Text missing"; diff --git a/com.wudsn.ide.pas/META-INF/MANIFEST.MF b/com.wudsn.ide.pas/META-INF/MANIFEST.MF index 5de9fcda..85201ce5 100644 --- a/com.wudsn.ide.pas/META-INF/MANIFEST.MF +++ b/com.wudsn.ide.pas/META-INF/MANIFEST.MF @@ -3,9 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: Peter Dell Bundle-SymbolicName: com.wudsn.ide.lng.pas;singleton:=true Bundle-Version: 1.7.2.qualifier -Bundle-Activator: com.wudsn.ide.pas.Activator +Bundle-Activator: com.wudsn.ide.lng.pas.Activator Bundle-Vendor: WUDSN IDE Pascal Plugin -Require-Bundle: org.eclipse.core.resources, +Require-Bundle: com.wudsn.ide.lng, + org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.jface.text, org.eclipse.ui, diff --git a/com.wudsn.ide.pas/OSGI-INF/l10n/bundle.properties b/com.wudsn.ide.pas/OSGI-INF/l10n/bundle.properties index 642d9dbc..745cc9d0 100644 --- a/com.wudsn.ide.pas/OSGI-INF/l10n/bundle.properties +++ b/com.wudsn.ide.pas/OSGI-INF/l10n/bundle.properties @@ -1,2 +1,2 @@ -#Properties file for com.wudsn.ide.pas -com.wudsn.ide.pas.compiler.PascalSourceFile.name=Pascal Source File \ No newline at end of file +#Properties file for com.wudsn.ide.lng.pas +com.wudsn.ide.lng.pas.compiler.PascalSourceFile.name=Pascal Source File \ No newline at end of file diff --git a/com.wudsn.ide.pas/OSGI-INF/l10n/bundle_de_DE.properties b/com.wudsn.ide.pas/OSGI-INF/l10n/bundle_de_DE.properties index 9a3ce72a..8633d9a1 100644 --- a/com.wudsn.ide.pas/OSGI-INF/l10n/bundle_de_DE.properties +++ b/com.wudsn.ide.pas/OSGI-INF/l10n/bundle_de_DE.properties @@ -1,2 +1,2 @@ -#Properties file for com.wudsn.ide.pas -com.wudsn.ide.pas.compiler.PascalSourceFile.name=Pascal Quell-Datei \ No newline at end of file +#Properties file for com.wudsn.ide.lng.pas +com.wudsn.ide.lng.pas.compiler.PascalSourceFile.name=Pascal Quell-Datei \ No newline at end of file diff --git a/com.wudsn.ide.pas/plugin.xml b/com.wudsn.ide.pas/plugin.xml index 760771d1..1808e831 100644 --- a/com.wudsn.ide.pas/plugin.xml +++ b/com.wudsn.ide.pas/plugin.xml @@ -21,21 +21,21 @@ @@ -44,7 +44,7 @@ + class="com.wudsn.ide.lng.pas.editor.ValidatorDocumentSetupParticipant"> diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/Activator.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/Activator.java similarity index 90% rename from com.wudsn.ide.pas/src/com/wudsn/ide/pas/Activator.java rename to com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/Activator.java index b5c8e4e5..711d325b 100644 --- a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/Activator.java +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/Activator.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with WUDSN IDE. If not, see . */ -package com.wudsn.ide.pas; +package com.wudsn.ide.lng.pas; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -29,7 +29,7 @@ import org.osgi.framework.BundleContext; public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "com.wudsn.ide.pas"; //$NON-NLS-1$ + public static final String PLUGIN_ID = "com.wudsn.ide.lng.pas"; //$NON-NLS-1$ // The shared instance private static Activator plugin; diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalContentAssistProcessor.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalContentAssistProcessor.java similarity index 98% rename from com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalContentAssistProcessor.java rename to com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalContentAssistProcessor.java index bb93ed50..d184ca1a 100644 --- a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalContentAssistProcessor.java +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalContentAssistProcessor.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with WUDSN IDE. If not, see . */ -package com.wudsn.ide.pas.editor; +package com.wudsn.ide.lng.pas.editor; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectNatureDescriptor; diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalHoverProvider.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalHoverProvider.java similarity index 98% rename from com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalHoverProvider.java rename to com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalHoverProvider.java index 28bf9a08..84a34c3e 100644 --- a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalHoverProvider.java +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalHoverProvider.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with WUDSN IDE. If not, see . */ -package com.wudsn.ide.pas.editor; +package com.wudsn.ide.lng.pas.editor; //import org.eclipse.core.resources.IProjectNatureDescriptor; //import org.eclipse.core.resources.IWorkspace; diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalReconciler.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalReconciler.java similarity index 98% rename from com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalReconciler.java rename to com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalReconciler.java index 35bf65d4..d9fe921a 100644 --- a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalReconciler.java +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalReconciler.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with WUDSN IDE. If not, see . */ -package com.wudsn.ide.pas.editor; +package com.wudsn.ide.lng.pas.editor; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalWordDetector.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalWordDetector.java similarity index 93% rename from com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalWordDetector.java rename to com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalWordDetector.java index a7337e4d..f97c8e17 100644 --- a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalWordDetector.java +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalWordDetector.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with WUDSN IDE. If not, see . */ -package com.wudsn.ide.pas.editor; +package com.wudsn.ide.lng.pas.editor; import org.eclipse.jface.text.rules.IWordDetector; diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalWordRule.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalWordRule.java similarity index 96% rename from com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalWordRule.java rename to com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalWordRule.java index fe39e1eb..cb1d4a1d 100644 --- a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/PascalWordRule.java +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/PascalWordRule.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with WUDSN IDE. If not, see . */ -package com.wudsn.ide.pas.editor; +package com.wudsn.ide.lng.pas.editor; import java.util.StringTokenizer; diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/ValidatorDocumentSetupParticipant.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/ValidatorDocumentSetupParticipant.java similarity index 98% rename from com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/ValidatorDocumentSetupParticipant.java rename to com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/ValidatorDocumentSetupParticipant.java index f7377c0c..cf1f8d1f 100644 --- a/com.wudsn.ide.pas/src/com/wudsn/ide/pas/editor/ValidatorDocumentSetupParticipant.java +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/editor/ValidatorDocumentSetupParticipant.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with WUDSN IDE. If not, see . */ -package com.wudsn.ide.pas.editor; +package com.wudsn.ide.lng.pas.editor; //import java.io.StringReader; // diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesApple2CompilersPage.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesApple2CompilersPage.java new file mode 100644 index 00000000..dbb330d5 --- /dev/null +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesApple2CompilersPage.java @@ -0,0 +1,41 @@ +/** + * Copyright (C) 2009 - 2021 Peter Dell + * + * This file is part of WUDSN IDE. + * + * WUDSN IDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * WUDSN IDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WUDSN IDE. If not, see . + */ +package com.wudsn.ide.lng.pas.preferences; + +import com.wudsn.ide.base.hardware.Hardware; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; + +/** + * Visual editor page for the assembler preferences regarding Apple 2 compilers. + * + * @author Peter Dell + * + */ +public final class PascalPreferencesApple2CompilersPage extends LanguagePreferencesCompilersPage { + + /** + * Create is public. Used by extension point "org.eclipse.ui.preferencePages". + */ + public PascalPreferencesApple2CompilersPage() { + super(Language.PAS, Hardware.APPLE2); + + } + +} \ No newline at end of file diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari2600CompilersPage.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari2600CompilersPage.java new file mode 100644 index 00000000..017a1167 --- /dev/null +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari2600CompilersPage.java @@ -0,0 +1,41 @@ +/** + * Copyright (C) 2009 - 2021 Peter Dell + * + * This file is part of WUDSN IDE. + * + * WUDSN IDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * WUDSN IDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WUDSN IDE. If not, see . + */ +package com.wudsn.ide.lng.pas.preferences; + +import com.wudsn.ide.base.hardware.Hardware; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; + +/** + * Visual editor page for the assembler preferences regarding Apple 2 compilers. + * + * @author Peter Dell + * + */ +public final class PascalPreferencesAtari2600CompilersPage extends LanguagePreferencesCompilersPage { + + /** + * Create is public. Used by extension point "org.eclipse.ui.preferencePages". + */ + public PascalPreferencesAtari2600CompilersPage() { + super(Language.ASM,Hardware.ATARI2600); + + } + +} \ No newline at end of file diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari7800CompilersPage.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari7800CompilersPage.java new file mode 100644 index 00000000..9bde879b --- /dev/null +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari7800CompilersPage.java @@ -0,0 +1,41 @@ +/** + * Copyright (C) 2009 - 2021 Peter Dell + * + * This file is part of WUDSN IDE. + * + * WUDSN IDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * WUDSN IDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WUDSN IDE. If not, see . + */ +package com.wudsn.ide.lng.pas.preferences; + +import com.wudsn.ide.base.hardware.Hardware; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; + +/** + * Visual editor page for the assembler preferences regarding Apple 2 compilers. + * + * @author Peter Dell + * + */ +public final class PascalPreferencesAtari7800CompilersPage extends LanguagePreferencesCompilersPage { + + /** + * Create is public. Used by extension point "org.eclipse.ui.preferencePages". + */ + public PascalPreferencesAtari7800CompilersPage() { + super(Language.ASM, Hardware.ATARI7800); + + } + +} \ No newline at end of file diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari8CompilersPage.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari8CompilersPage.java new file mode 100644 index 00000000..40e02765 --- /dev/null +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesAtari8CompilersPage.java @@ -0,0 +1,42 @@ +/** + * Copyright (C) 2009 - 2021 Peter Dell + * + * This file is part of WUDSN IDE. + * + * WUDSN IDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * WUDSN IDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WUDSN IDE. If not, see . + */ +package com.wudsn.ide.lng.pas.preferences; + +import com.wudsn.ide.base.hardware.Hardware; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; + +/** + * Visual editor page for the assembler preferences regarding Atari 8-bit + * compilers. + * + * @author Peter Dell + * + */ +public final class PascalPreferencesAtari8CompilersPage extends LanguagePreferencesCompilersPage { + + /** + * Create is public. Used by extension point "org.eclipse.ui.preferencePages". + */ + public PascalPreferencesAtari8CompilersPage() { + super(Language.ASM,Hardware.ATARI8BIT); + + } + +} \ No newline at end of file diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesC64CompilersPage.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesC64CompilersPage.java new file mode 100644 index 00000000..73109a76 --- /dev/null +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesC64CompilersPage.java @@ -0,0 +1,41 @@ +/** + * Copyright (C) 2009 - 2021 Peter Dell + * + * This file is part of WUDSN IDE. + * + * WUDSN IDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * WUDSN IDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WUDSN IDE. If not, see . + */ +package com.wudsn.ide.lng.pas.preferences; + +import com.wudsn.ide.base.hardware.Hardware; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; + +/** + * Visual editor page for the assembler preferences regarding C64 compilers. + * + * @author Peter Dell + * + */ +public final class PascalPreferencesC64CompilersPage extends LanguagePreferencesCompilersPage { + + /** + * Create is public. Used by extension point "org.eclipse.ui.preferencePages". + */ + public PascalPreferencesC64CompilersPage() { + super(Language.ASM, Hardware.C64); + + } + +} \ No newline at end of file diff --git a/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesNESCompilersPage.java b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesNESCompilersPage.java new file mode 100644 index 00000000..134279a5 --- /dev/null +++ b/com.wudsn.ide.pas/src/com/wudsn/ide/lng/pas/preferences/PascalPreferencesNESCompilersPage.java @@ -0,0 +1,41 @@ +/** + * Copyright (C) 2009 - 2021 Peter Dell + * + * This file is part of WUDSN IDE. + * + * WUDSN IDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * WUDSN IDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WUDSN IDE. If not, see . + */ +package com.wudsn.ide.lng.pas.preferences; + +import com.wudsn.ide.base.hardware.Hardware; +import com.wudsn.ide.lng.Language; +import com.wudsn.ide.lng.preferences.LanguagePreferencesCompilersPage; + +/** + * Visual editor page for the assembler preferences regarding NES compilers. + * + * @author Peter Dell + * + */ +public final class PascalPreferencesNESCompilersPage extends LanguagePreferencesCompilersPage { + + /** + * Create is public. Used by extension point "org.eclipse.ui.preferencePages". + */ + public PascalPreferencesNESCompilersPage() { + super(Language.ASM,Hardware.NES); + + } + +} \ No newline at end of file