feat: add support for const qualifiers

chipsalliance · Mar 10, 2023 · 58e9655 · 58e9655
1 parent 741298f
commit 58e9655
Show file tree

Hide file tree

Showing 5 changed files with 5,797 additions and 5,594 deletions.
diff --git a/grammar.js b/grammar.js
@@ -86,11 +86,13 @@ module.exports = grammar({
  ),
 
  port: $ => seq(
- $.dir, $.identifier, ':', $.type, optional($.info), $._newline,
+ $.dir, $.identifier, ':', optional($.qualifier), $.type, optional($.info), $._newline
  ),
 
  dir: _ => choice('input', 'output'),
 
+ qualifier: _ => choice('const'),
+
  type: $ => choice(
  seq(
  choice('UInt', 'SInt', 'Analog'),
@@ -381,7 +383,7 @@ module.exports = grammar({
 
  _escape_sequence: $ =>
  choice(
- prec(2, token.immediate(seq('\\', /[^abfnrtvxu'\"\\\?]/))),
+ prec(2, token.immediate(seq('\\', /[^abfnrtvxu'"\\?]/))),
  prec(1, $.escape_sequence)
  ),
  escape_sequence: _ => token.immediate(seq(

diff --git a/queries/highlights.scm b/queries/highlights.scm
@@ -47,10 +47,14 @@
 
 ; Qualifiers
 
+(qualifier) @type.qualifier
+
+; Storageclasses
+
 [
  "input"
  "output"
-] @type.qualifier ; Could be storageclass tbh..
+] @storageclass
 
 ; Conditionals
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -226,6 +226,18 @@
  "type": "STRING",
  "value": ":"
  },
+ {
+ "type": "CHOICE",
+ "members": [
+ {
+ "type": "SYMBOL",
+ "name": "qualifier"
+ },
+ {
+ "type": "BLANK"
+ }
+ ]
+ },
  {
  "type": "SYMBOL",
  "name": "type"
@@ -261,6 +273,15 @@
  }
  ]
  },
+ "qualifier": {
+ "type": "CHOICE",
+ "members": [
+ {
+ "type": "STRING",
+ "value": "const"
+ }
+ ]
+ },
  "type": {
  "type": "CHOICE",
  "members": [

diff --git a/src/node-types.json b/src/node-types.json
@@ -585,6 +585,10 @@
  "type": "info",
  "named": true
  },
+ {
+ "type": "qualifier",
+ "named": true
+ },
  {
  "type": "type",
  "named": true
@@ -643,6 +647,11 @@
  ]
  }
  },
+ {
+ "type": "qualifier",
+ "named": true,
+ "fields": {}
+ },
  {
  "type": "raw_string",
  "named": true,
@@ -1187,6 +1196,10 @@
  "type": "comment",
  "named": true
  },
+ {
+ "type": "const",
+ "named": false
+ },
  {
  "type": "cover",
  "named": false