mirror of
https://github.com/open-goal/opengoal-vscode.git
synced 2024-10-19 20:47:37 -04:00
syntax/ir: fix clash between constants and registers (#14)
This commit is contained in:
parent
8d01d8b7bd
commit
7d93f67a6f
78
package-lock.json
generated
78
package-lock.json
generated
|
@ -12,7 +12,6 @@
|
|||
"comment-json": "^4.2.2",
|
||||
"follow-redirects": "^1.15.1",
|
||||
"glob": "^8.0.3",
|
||||
"open": "^8.4.0",
|
||||
"vscode-languageclient": "^8.0.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
@ -543,14 +542,6 @@
|
|||
"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/define-lazy-prop": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
|
||||
"integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/dir-glob": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
|
||||
|
@ -1073,20 +1064,6 @@
|
|||
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
|
||||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
|
||||
},
|
||||
"node_modules/is-docker": {
|
||||
"version": "2.2.1",
|
||||
"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
|
||||
"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
|
||||
"bin": {
|
||||
"is-docker": "cli.js"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/is-extglob": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
||||
|
@ -1117,17 +1094,6 @@
|
|||
"node": ">=0.12.0"
|
||||
}
|
||||
},
|
||||
"node_modules/is-wsl": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
|
||||
"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
|
||||
"dependencies": {
|
||||
"is-docker": "^2.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/isexe": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
|
||||
|
@ -1241,22 +1207,6 @@
|
|||
"wrappy": "1"
|
||||
}
|
||||
},
|
||||
"node_modules/open": {
|
||||
"version": "8.4.0",
|
||||
"resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
|
||||
"integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
|
||||
"dependencies": {
|
||||
"define-lazy-prop": "^2.0.0",
|
||||
"is-docker": "^2.1.1",
|
||||
"is-wsl": "^2.2.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/optionator": {
|
||||
"version": "0.9.1",
|
||||
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
|
||||
|
@ -2059,11 +2009,6 @@
|
|||
"integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
|
||||
"dev": true
|
||||
},
|
||||
"define-lazy-prop": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
|
||||
"integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og=="
|
||||
},
|
||||
"dir-glob": {
|
||||
"version": "3.0.1",
|
||||
"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
|
||||
|
@ -2454,11 +2399,6 @@
|
|||
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
|
||||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
|
||||
},
|
||||
"is-docker": {
|
||||
"version": "2.2.1",
|
||||
"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
|
||||
"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ=="
|
||||
},
|
||||
"is-extglob": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
||||
|
@ -2480,14 +2420,6 @@
|
|||
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
|
||||
"dev": true
|
||||
},
|
||||
"is-wsl": {
|
||||
"version": "2.2.0",
|
||||
"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
|
||||
"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
|
||||
"requires": {
|
||||
"is-docker": "^2.0.0"
|
||||
}
|
||||
},
|
||||
"isexe": {
|
||||
"version": "2.0.0",
|
||||
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
|
||||
|
@ -2583,16 +2515,6 @@
|
|||
"wrappy": "1"
|
||||
}
|
||||
},
|
||||
"open": {
|
||||
"version": "8.4.0",
|
||||
"resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
|
||||
"integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
|
||||
"requires": {
|
||||
"define-lazy-prop": "^2.0.0",
|
||||
"is-docker": "^2.1.1",
|
||||
"is-wsl": "^2.2.0"
|
||||
}
|
||||
},
|
||||
"optionator": {
|
||||
"version": "0.9.1",
|
||||
"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz",
|
||||
|
|
|
@ -82,7 +82,7 @@
|
|||
"match": "(#t|#f)"
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s+)([\\-]?\\d+(?:\\.\\d+)?)(?:[\\s\\(\\>])",
|
||||
"match": "(?:\\s+)([\\-]?\\d+(?:\\.\\d+)?)(?=[\\s\\(\\>])",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "constant.numeric"
|
||||
|
@ -94,7 +94,7 @@
|
|||
"registers": {
|
||||
"patterns": [
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(a0)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(a0(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs.a0"
|
||||
|
@ -105,7 +105,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(a1)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(a1(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs.a1"
|
||||
|
@ -116,7 +116,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(a2)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(a2(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs.a2"
|
||||
|
@ -127,7 +127,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(a3)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(a3(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs.a3"
|
||||
|
@ -138,7 +138,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(t0)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(t0(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs.t0"
|
||||
|
@ -149,7 +149,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(t1)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(t1(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs.t1"
|
||||
|
@ -160,7 +160,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(t2)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(t2(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs.t2"
|
||||
|
@ -171,7 +171,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(t3)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(t3(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs.t3"
|
||||
|
@ -182,7 +182,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(t9)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(t9(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "entity.name.function.opengoal.ir.regs.function"
|
||||
|
@ -193,7 +193,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(f\\d{1,2})(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(f\\d{1,2}(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs.float"
|
||||
|
@ -204,7 +204,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(sp)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(sp(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs.stack"
|
||||
|
@ -215,7 +215,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(v0)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(v0(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs.return"
|
||||
|
@ -226,7 +226,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(s7)(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(s7(?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "entity.name.function.opengoal.ir.regs.symbol-table"
|
||||
|
@ -237,7 +237,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"match": "(?:\\s|\\(|\\[)(gp|fp|at|v1|ra|r0|k0|k1|t8|s[0-6]|t[4-7])(-[\\d]+)?",
|
||||
"match": "(?:\\s|\\(|\\[)(gp|fp|at|v1|ra|r0|k0|k1|t8|s[0-6]|t[4-7](?:-[\\d]+)?)",
|
||||
"captures": {
|
||||
"1": {
|
||||
"name": "variable.language.opengoal.ir.regs"
|
||||
|
|
Loading…
Reference in a new issue