Skip to content

Commit bb69410

Browse files
committed
Update README, add links
1 parent 2d63d28 commit bb69410

29 files changed

Lines changed: 1980 additions & 406 deletions

README.md

Lines changed: 132 additions & 39 deletions
Large diffs are not rendered by default.

editors/vscode/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Uttori Assembly
22

3-
Assembly language support powered by [uttori-asm](https://github.com/MatthewCallis/uttori-asm), currently bundled with the first-party SNES target.
3+
Assembly language support powered by [uttori-asm](https://github.com/uttori/asm), currently bundled with the first-party SNES target and 65xx target.
44

55
Requires VS Code 1.128 or newer and implements the [Language Server Protocol 3.18 specification](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.18/specification/).
66

editors/vscode/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"author": "Matthew Callis <matthew.callis@gmail.com>",
1212
"repository": {
1313
"type": "git",
14-
"url": "https://github.com/MatthewCallis/uttori-asm.git",
14+
"url": "https://github.com/uttori/asm.git",
1515
"directory": "editors/vscode"
1616
},
1717
"publisher": "matthewcallis",

editors/vscode/server/server.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24475,7 +24475,7 @@ var WorkspaceIndex = class {
2447524475
const followIncludes = options.followIncludes ?? true;
2447624476
this.lastRootServedFromCache = false;
2447724477
this.logger?.info(
24478-
`Analyzing ${path4.basename(root)} (followIncludes=${followIncludes}, ${content.length} chars)\u2026`
24478+
`Analyzing ${path4.basename(root)} (followIncludes=${followIncludes}, ${content.length} chars)...`
2447924479
);
2448024480
if (followIncludes && this.cache) {
2448124481
const cached = this.cache.read(root, this.cacheIdentity(), (file) => this.hashFile(file));
@@ -32921,7 +32921,7 @@ var ArchSPC700 = class {
3292132921
return true;
3292232922
}
3292332923
/**
32924-
* Relative branches (BPLBRA). Opcode is written first, so the displacement
32924+
* Relative branches (BPL...BRA). Opcode is written first, so the displacement
3292532925
* is `target - (pc + 1)` - equivalent to `target - (start + 2)` before the
3292632926
* write. `+`/`-` unnamed labels use that same post-opcode PC.
3292732927
*
@@ -34269,8 +34269,8 @@ var ArchSuperFX = class {
3426934269
return false;
3427034270
}
3427134271
/**
34272-
* Handles implied SuperFX opcodes with no operands (STOP, NOP, ALT1, ) and
34273-
* two-byte prefixed ops (PLOT, SWAP, ) from PREFIXED_OPCODES.
34272+
* Handles implied SuperFX opcodes with no operands (STOP, NOP, ALT1, ...) and
34273+
* two-byte prefixed ops (PLOT, SWAP, ...) from PREFIXED_OPCODES.
3427434274
* @param {string} opcode Uppercased mnemonic.
3427534275
* @returns {boolean} True if the instruction was handled, false otherwise.
3427634276
*/
@@ -35432,7 +35432,7 @@ var directiveCatalog2 = [
3543235432
},
3543335433
{
3543435434
keyword: "title",
35435-
summary: "Enable read1\u2026read4 without a default value. Does not inspect the ROM title.",
35435+
summary: "Enable read1...read4 without a default value. Does not inspect the ROM title.",
3543635436
syntax: "check title"
3543735437
}
3543835438
]

language-server/out/server.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24475,7 +24475,7 @@ var WorkspaceIndex = class {
2447524475
const followIncludes = options.followIncludes ?? true;
2447624476
this.lastRootServedFromCache = false;
2447724477
this.logger?.info(
24478-
`Analyzing ${path4.basename(root)} (followIncludes=${followIncludes}, ${content.length} chars)\u2026`
24478+
`Analyzing ${path4.basename(root)} (followIncludes=${followIncludes}, ${content.length} chars)...`
2447924479
);
2448024480
if (followIncludes && this.cache) {
2448124481
const cached = this.cache.read(root, this.cacheIdentity(), (file) => this.hashFile(file));
@@ -32921,7 +32921,7 @@ var ArchSPC700 = class {
3292132921
return true;
3292232922
}
3292332923
/**
32924-
* Relative branches (BPLBRA). Opcode is written first, so the displacement
32924+
* Relative branches (BPL...BRA). Opcode is written first, so the displacement
3292532925
* is `target - (pc + 1)` - equivalent to `target - (start + 2)` before the
3292632926
* write. `+`/`-` unnamed labels use that same post-opcode PC.
3292732927
*
@@ -34269,8 +34269,8 @@ var ArchSuperFX = class {
3426934269
return false;
3427034270
}
3427134271
/**
34272-
* Handles implied SuperFX opcodes with no operands (STOP, NOP, ALT1, ) and
34273-
* two-byte prefixed ops (PLOT, SWAP, ) from PREFIXED_OPCODES.
34272+
* Handles implied SuperFX opcodes with no operands (STOP, NOP, ALT1, ...) and
34273+
* two-byte prefixed ops (PLOT, SWAP, ...) from PREFIXED_OPCODES.
3427434274
* @param {string} opcode Uppercased mnemonic.
3427534275
* @returns {boolean} True if the instruction was handled, false otherwise.
3427634276
*/
@@ -35432,7 +35432,7 @@ var directiveCatalog2 = [
3543235432
},
3543335433
{
3543435434
keyword: "title",
35435-
summary: "Enable read1\u2026read4 without a default value. Does not inspect the ROM title.",
35435+
summary: "Enable read1...read4 without a default value. Does not inspect the ROM title.",
3543635436
syntax: "check title"
3543735437
}
3543835438
]

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"private": true,
55
"description": "A pluggable assembler toolkit for TypeScript and Node.js.",
66
"keywords": [],
7-
"homepage": "https://github.com/MatthewCallis/uttori-asm",
7+
"homepage": "https://github.com/uttori/asm",
88
"license": "MIT",
99
"author": "Matthew Callis <matthew.callis@gmail.com>",
1010
"contributors": [],
11-
"repository": "MatthewCallis/uttori-asm",
11+
"repository": "uttori/asm",
1212
"workspaces": [
1313
"packages/*",
1414
"plugins/*",

packages/core/src/lsp/workspace-index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ export class WorkspaceIndex {
537537
const followIncludes = options.followIncludes ?? true;
538538
this.lastRootServedFromCache = false;
539539
this.logger?.info(
540-
`Analyzing ${path.basename(root)} (followIncludes=${followIncludes}, ${content.length} chars)`,
540+
`Analyzing ${path.basename(root)} (followIncludes=${followIncludes}, ${content.length} chars)...`,
541541
);
542542

543543
if (followIncludes && this.cache) {

packages/core/src/mathcore.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ export class MathCore {
495495
argument: ExpressionNode,
496496
): number | string {
497497
if (this.isStringArgument(functionName, argumentIndex)) {
498-
// String slots (defined, sizeof, filesize, ) keep the source text, not a label value.
498+
// String slots (defined, sizeof, filesize, ...) keep the source text, not a label value.
499499
switch (argument.type) {
500500
case "identifier":
501501
return argument.name;
@@ -756,7 +756,7 @@ export class MathCore {
756756
}
757757

758758
// Try matching the next two characters first. If they form a known operator
759-
// (`&&`, `||`, `==`, `**`, ), do not fall through to a one-character prefix
759+
// (`&&`, `||`, `==`, `**`, ...), do not fall through to a one-character prefix
760760
// (`&` vs `&&`). When the two-character operator exists but is too weak for
761761
// this depth, return null rather than consuming `&` / `|` / `=`.
762762
const remaining = this.scanSource.length - this.scanIndex;

packages/core/src/services/macro-engine.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ export class MacroEngine {
813813
// Define assignments inside a macro `if` must take effect before the next
814814
// expanded `if !TEMP1 == !TRUE`. processCommand would buffer them in the
815815
// incremental if-tree until endif. Do not eager-apply inside while/for -
816-
// v140features uses `while``endif` in macros and those `#=` updates must
816+
// v140features uses `while`...`endif` in macros and those `#=` updates must
817817
// stay in the loop body.
818818
const isDefineAssignment = /^!\w+\s*(?:#=|\+=|:=|\?=|=(?!=))/.test(trimmed);
819819
if (isDefineAssignment && !this.isMacroExpansionLoopActive()) {

0 commit comments

Comments
 (0)