diff options
| -rw-r--r-- | etc/config/carbon.amazon.properties (renamed from etc/config/quetzal.amazon.properties) | 4 | ||||
| -rw-r--r-- | etc/config/carbon.defaults.properties (renamed from etc/config/quetzal.defaults.properties) | 4 | ||||
| -rw-r--r-- | examples/carbon/default.carbon (renamed from examples/quetzal/default.quetzal) | 0 | ||||
| -rw-r--r-- | lib/compilers/_all.js | 2 | ||||
| -rw-r--r-- | lib/compilers/carbon.js (renamed from lib/compilers/quetzal.js) | 6 | ||||
| -rw-r--r-- | lib/languages.ts | 10 | ||||
| -rw-r--r-- | static/modes/_all.ts | 2 | ||||
| -rw-r--r-- | static/modes/carbon-mode.ts (renamed from static/modes/quetzal-mode.ts) | 6 | ||||
| -rw-r--r-- | types/languages.interfaces.ts | 2 | ||||
| -rw-r--r-- | views/resources/logos/carbon.svg (renamed from views/resources/logos/quetzal.svg) | 2 |
10 files changed, 20 insertions, 18 deletions
diff --git a/etc/config/quetzal.amazon.properties b/etc/config/carbon.amazon.properties index 6e20cc7f1..80a683bf6 100644 --- a/etc/config/quetzal.amazon.properties +++ b/etc/config/carbon.amazon.properties @@ -1,10 +1,10 @@ # Amazon prod environment settings compilers=trunk defaultCompiler=trunk -compilerType=quetzal +compilerType=carbon needsMulti=false -compiler.trunk.exe=/opt/compiler-explorer/quetzal-trunk/bin/quetzal-explorer +compiler.trunk.exe=/opt/compiler-explorer/carbon-trunk/bin/carbon-explorer compiler.trunk.name=Explorer (trunk) libs= diff --git a/etc/config/quetzal.defaults.properties b/etc/config/carbon.defaults.properties index 3cabe1edf..27e7d2fbf 100644 --- a/etc/config/quetzal.defaults.properties +++ b/etc/config/carbon.defaults.properties @@ -1,7 +1,7 @@ -# Default settings for quetzal +# Default settings for carbon compilers=trunk defaultCompiler=trunk -compilerType=quetzal +compilerType=carbon needsMulti=false supportsExecute=false diff --git a/examples/quetzal/default.quetzal b/examples/carbon/default.carbon index 7402b4802..7402b4802 100644 --- a/examples/quetzal/default.quetzal +++ b/examples/carbon/default.carbon diff --git a/lib/compilers/_all.js b/lib/compilers/_all.js index 03541096c..8cf645a04 100644 --- a/lib/compilers/_all.js +++ b/lib/compilers/_all.js @@ -27,7 +27,7 @@ export {AnalysisTool} from './analysis-tool'; export {AssemblyCompiler} from './assembly'; export {BeebAsmCompiler} from './beebasm'; export {NasmCompiler} from './nasm'; -export {QuetzalCompiler} from './quetzal'; +export {CarbonCompiler} from './carbon'; export {Cc65Compiler} from './cc65'; export {CircleCompiler} from './circle'; export {ClangCompiler} from './clang'; diff --git a/lib/compilers/quetzal.js b/lib/compilers/carbon.js index 0efba869a..ce436cd46 100644 --- a/lib/compilers/quetzal.js +++ b/lib/compilers/carbon.js @@ -25,9 +25,9 @@ import {BaseCompiler} from '../base-compiler'; import {BaseParser} from './argument-parsers'; -export class QuetzalCompiler extends BaseCompiler { +export class CarbonCompiler extends BaseCompiler { static get key() { - return 'quetzal'; + return 'carbon'; } constructor(compilerInfo, env) { @@ -70,6 +70,7 @@ export class QuetzalCompiler extends BaseCompiler { customBuildPath, ); if (result.code === 0) { + // Hook to parse out the "result: 123" line at the end of the interpreted execution run. const re = /^result: (\d+)$/; const match = re.exec(result.asm.at(-1).text); const code = match ? parseInt(match[1]) : -1; @@ -86,6 +87,7 @@ export class QuetzalCompiler extends BaseCompiler { } getArgumentParser() { + // TODO: may need a custom one, based on/borrowing from ClangParser return BaseParser; } } diff --git a/lib/languages.ts b/lib/languages.ts index eed359d9e..5922e96e2 100644 --- a/lib/languages.ts +++ b/lib/languages.ts @@ -93,12 +93,12 @@ const definitions: Record<LanguageKey, LanguageDefinition> = { formatter: 'clangformat', previewFilter: /^\s*#include/, }, - quetzal: { - name: 'quetzal', - monaco: 'quetzal', - extensions: ['.quetzal'], + carbon: { + name: 'carbon', + monaco: 'carbon', + extensions: ['.carbon'], alias: [], - logoUrl: 'quetzal.svg', + logoUrl: 'carbon.svg', logoUrlDark: null, formatter: null, previewFilter: null, diff --git a/static/modes/_all.ts b/static/modes/_all.ts index 86e8a9270..a290c1487 100644 --- a/static/modes/_all.ts +++ b/static/modes/_all.ts @@ -26,7 +26,7 @@ import './ada-mode'; import './asm6502-mode'; import './asm-mode'; import './asmruby-mode'; -import './quetzal-mode'; +import './carbon-mode'; import './clean-mode'; import './cmake-mode'; import './cpp-for-opencl-mode'; diff --git a/static/modes/quetzal-mode.ts b/static/modes/carbon-mode.ts index b5cd5a0cc..c05e1c4b1 100644 --- a/static/modes/quetzal-mode.ts +++ b/static/modes/carbon-mode.ts @@ -166,8 +166,8 @@ function definition() { } const def = definition(); -monaco.languages.register({id: 'quetzal'}); -monaco.languages.setMonarchTokensProvider('quetzal', def); -monaco.languages.setLanguageConfiguration('quetzal', cpp.conf); +monaco.languages.register({id: 'carbon'}); +monaco.languages.setMonarchTokensProvider('carbon', def); +monaco.languages.setLanguageConfiguration('carbon', cpp.conf); export = def; diff --git a/types/languages.interfaces.ts b/types/languages.interfaces.ts index 15330576f..f4ea75d28 100644 --- a/types/languages.interfaces.ts +++ b/types/languages.interfaces.ts @@ -66,7 +66,7 @@ export type LanguageKey = | 'typescript' | 'solidity' | 'toit' - | 'quetzal'; + | 'carbon'; export interface Language { /** Id of language. Added programmatically based on CELanguages key */ diff --git a/views/resources/logos/quetzal.svg b/views/resources/logos/carbon.svg index 8c88534d1..1256f7630 100644 --- a/views/resources/logos/quetzal.svg +++ b/views/resources/logos/carbon.svg @@ -5,7 +5,7 @@ height="420.00031" version="1.1" id="svg10" - sodipodi:docname="quetzal.svg" + sodipodi:docname="carbon.svg" inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" |
