MINT: CONTROL layer support, _fromMINT.json output, token/context fixes

- Parser/lexer: idParam, ID_BIG in ufname/uftarget, controlBlock _ctx restore
- Compiler: idParam handling, uftarget token .text vs getText for Channel/Net
- Output: write <stem>_fromMINT.json to match LFR _fromLFR.json naming

Author: zyrrron

mint.g4

@@ -130,7 +130,12 @@ paramStat:
 	| widthParam
 	| constraintParams
 	| lengthParam
-	| spacingParam;
+	| spacingParam
+	| idParam;
+
+idParam: param_element WS* '=' WS* id_value;
+
+id_value: ID | ID_BIG;
 
 constraintParams:
 	rotationParam
@@ -174,9 +179,9 @@ ufterminal: INT;
 
 uftargets: uftarget WS* (',' WS* uftarget)+;
 
-uftarget: target_name = ID (WS+ target_terminal = INT)?;
+uftarget: target_name = (ID | ID_BIG) (WS+ target_terminal = INT)?;
 
-ufname: ID;
+ufname: (ID | ID_BIG);
 
 ufnames: ufname WS* (',' WS* ufname)* WS*;
 
@@ -200,7 +205,7 @@ ID: ('a' ..'z' | '_') (
 		| '_'
 	)*;
 
-ID_BIG: ('A' ..'Z' | '_') ('A' ..'Z' | '_' | '0' ..'9')*;
+ID_BIG: ('A' ..'Z' | '_') ('A' ..'Z' | 'a' ..'z' | '_' | '0' ..'9')*;
 
 INT: [0-9]+; // Define token INT as one or more digits
 

pymint/antlrgen/mintLexer.py

@@ -242,5 +242,24 @@ def __init__(self, input=None, output:TextIO = sys.stdout):
         self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
         self._actions = None
         self._predicates = None
+        self._pending_token = None
+
+    def nextToken(self):
+        """Override to merge single-char ID_BIG with following ID (e.g. C + port_0 -> Cport_0)."""
+        if self._pending_token is not None:
+            t = self._pending_token
+            self._pending_token = None
+            return t
+        t = super().nextToken()
+        if t.type == mintLexer.ID_BIG and t.text and len(t.text) == 1 and t.text[0].isupper():
+            n = super().nextToken()
+            if n.type == mintLexer.ID and n.text:
+                merged = t.clone()
+                merged.type = mintLexer.ID_BIG
+                merged.stop = n.stop
+                merged._text = t.text + n.text
+                return merged
+            self._pending_token = n
+        return t
 
 

pymint/antlrgen/mintListener.py

@@ -323,6 +323,24 @@ def exitParamStat(self, ctx:mintParser.ParamStatContext):
         pass
 
 
+    # Enter a parse tree produced by mintParser#idParam.
+    def enterIdParam(self, ctx:mintParser.IdParamContext):
+        pass
+
+    # Exit a parse tree produced by mintParser#idParam.
+    def exitIdParam(self, ctx:mintParser.IdParamContext):
+        pass
+
+
+    # Enter a parse tree produced by mintParser#id_value.
+    def enterId_value(self, ctx:mintParser.Id_valueContext):
+        pass
+
+    # Exit a parse tree produced by mintParser#id_value.
+    def exitId_value(self, ctx:mintParser.Id_valueContext):
+        pass
+
+
     # Enter a parse tree produced by mintParser#constraintParams.
     def enterConstraintParams(self, ctx:mintParser.ConstraintParamsContext):
         pass