From 71e4f3812982dba2efb471283d310224e8db363e Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Wed, 3 Mar 2021 22:09:50 -0800 Subject: 7842 - new directory organization Baremetal is now the default build target and therefore has its sources at the top-level. Baremetal programs build using the phase-2 Mu toolchain that requires a Linux kernel. This phase-2 codebase which used to be at the top-level is now under the linux/ directory. Finally, the phase-2 toolchain, while self-hosting, has a way to bootstrap from a C implementation, which is now stored in linux/bootstrap. The bootstrap C implementation uses some literate programming tools that are now in linux/bootstrap/tools. So the whole thing has gotten inverted. Each directory should build one artifact and include the main sources (along with standard library). Tools used for building it are relegated to sub-directories, even though those tools are often useful in their own right, and have had lots of interesting programs written using them. A couple of things have gotten dropped in this process: - I had old ways to run on just a Linux kernel, or with a Soso kernel. No more. - I had some old tooling for running a single test at the cursor. I haven't used that lately. Maybe I'll bring it back one day. The reorg isn't done yet. Still to do: - redo documentation everywhere. All the README files, all other markdown, particularly vocabulary.md. - clean up how-to-run comments at the start of programs everywhere - rethink what to do with the html/ directory. Do we even want to keep supporting it? In spite of these shortcomings, all the scripts at the top-level, linux/ and linux/bootstrap are working. The names of the scripts also feel reasonable. This is a good milestone to take stock at. --- editor/atom/README.md | 3 +++ editor/atom/grammars/subx.json | 43 ++++++++++++++++++++++++++++++++++++++++++ editor/atom/package.json | 17 +++++++++++++++++ editor/atom/styles/styles.less | 31 ++++++++++++++++++++++++++++++ 4 files changed, 94 insertions(+) create mode 100644 editor/atom/README.md create mode 100644 editor/atom/grammars/subx.json create mode 100644 editor/atom/package.json create mode 100644 editor/atom/styles/styles.less (limited to 'editor/atom') diff --git a/editor/atom/README.md b/editor/atom/README.md new file mode 100644 index 00000000..6abde7e8 --- /dev/null +++ b/editor/atom/README.md @@ -0,0 +1,3 @@ +## Syntax highlighting for the Atom editor + +Copy or symlink this directory into `~/.atom/packages/subx`. diff --git a/editor/atom/grammars/subx.json b/editor/atom/grammars/subx.json new file mode 100644 index 00000000..8ba8c077 --- /dev/null +++ b/editor/atom/grammars/subx.json @@ -0,0 +1,43 @@ +{ + "scopeName": "source.subx", + "name": "SubX", + "fileTypes": ["subx"], + "patterns": [ + { + "name": "header-comment.subx", + "match": "# - .*" + }, + { + "name": "comment-sub-2.subx", + "match": "# \\. \\. .*" + }, + { + "name": "comment-sub-1.subx", + "match": "# \\. .*" + }, + { + "name": "comment.subx", + "match": "#.*" + }, + { + "name": "strings.subx", + "match": "\"[^\"]*\"" + }, + { + "name": "test.subx", + "match": "^test-[^ ]*:" + }, + { + "name": "global.subx", + "match": "^[A-Z][^ ]*:" + }, + { + "name": "function.subx", + "match": "^[^_$ #][^ ]*:" + }, + { + "name": "label.subx", + "match": "^[_$][^ ]*:" + } + ] +} diff --git a/editor/atom/package.json b/editor/atom/package.json new file mode 100644 index 00000000..a9936fc4 --- /dev/null +++ b/editor/atom/package.json @@ -0,0 +1,17 @@ +{ + "name": "subx", + "version": "0.0.1", + "description": "Syntax highlighting for SubX files in the Mu computing stack.", + "author": "Kartik Agaram", + "keywords": [ + "language", + "mu", + "syntax", + "highlighting" + ], + "repository": "https://github.com/akkartik/mu", + "engines": { + "atom": ">=1.0.0 <2.0.0" + }, + "dependencies": {} +} diff --git a/editor/atom/styles/styles.less b/editor/atom/styles/styles.less new file mode 100644 index 00000000..7aa18ef7 --- /dev/null +++ b/editor/atom/styles/styles.less @@ -0,0 +1,31 @@ +atom-text-editor.editor { + .syntax--source.syntax--subx { + .syntax--header-comment.syntax--subx { + color: #ccccff; + } + .syntax--comment-sub-1.syntax--subx { + color: #888888; + } + .syntax--comment-sub-2.syntax--subx { + color: #666666; + } + .syntax--comment.syntax--subx { + color: #8888ff; + } + .syntax--strings.syntax--subx { + color: cyan; + } + .syntax--function.syntax--subx { + color: orange; + } + .syntax--global.syntax--subx { + color: red; + } + .syntax--test.syntax--subx { + color: #88ff88; + } + .syntax--label.syntax--subx { + color: #448844; + } + } +} -- cgit 1.4.1-2-gfad0