Accept // line comments in MINT so LFR-generated headers parse.

compile_lfr writes PORT COUNT CORRECTION blocks with //, which the lexer previously rejected.

Author: zyrrron

mint.g4

@@ -222,7 +222,7 @@ WS: [ \t]+;
 
 NL: [\r\n]+ -> skip; // Define whitespace rule, toss it out
 
-COMMENT: '#' ~[\r\n]* -> skip;
+COMMENT: ('//' | '#') ~[\r\n]* -> skip;
 
 Real_number:
 	Unsigned_number '.' Unsigned_number

pymint/mintdevice.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from pathlib import Path
 from typing import Dict, List, Optional
 
 from parchmint import Component, Connection, Layer, Params, Target
@@ -19,6 +20,24 @@
 )
 
 
+def strip_mint_line_comments(text: str) -> str:
+    """Remove MINT line comments so the lexer never sees them.
+
+    ``mint.g4`` skips both ``#`` (original) and ``//`` (LFR-style headers that
+    ``compile_lfr`` writes onto generated MINT, e.g. PORT COUNT CORRECTION).
+    Strip here as well so files parse even before ANTLR is regenerated.
+    """
+    out: List[str] = []
+    for line in text.splitlines():
+        if "//" in line:
+            line = line.split("//", 1)[0]
+        hash_at = line.find("#")
+        if hash_at != -1:
+            line = line[:hash_at]
+        out.append(line)
+    return "\n".join(out)
+
+
 class MINTDevice(MINTProtocol):
     """Device class abstracting parchmint Device object adding additional
     methods for generating MINT
@@ -308,15 +327,17 @@ def from_mint_file(filepath: str, skip_constraints: bool = False) -> MINTDevice:
         """
         import io
 
-        from antlr4 import CommonTokenStream, FileStream, ParseTreeWalker
+        from antlr4 import CommonTokenStream, InputStream, ParseTreeWalker
 
         from pymint.antlrgen.mintLexer import mintLexer
         from pymint.antlrgen.mintParser import mintParser
         from pymint.constraints.constraintlistener import ConstraintListener
         from pymint.mintcompiler import MINTCompiler
         from pymint.mintErrorListener import MINTErrorListener
 
-        finput = FileStream(filepath, encoding="utf-8")
+        raw = Path(filepath).read_text(encoding="utf-8")
+        finput = InputStream(strip_mint_line_comments(raw))
+        finput.name = filepath
 
         lexer = mintLexer(finput)
 

pymint/mintwriter.py

@@ -13,7 +13,7 @@ def to_params_MINT(params: Params) -> str:
     Returns:
         str: MINT string fragment
     """
-    skip_list = ["paths", "wayPoints", "position"]
+    skip_list = ["paths", "wayPoints", "position", "start", "end", "segments"]
     ret = ""
     for key in params.data:
         if key in skip_list:
@@ -61,8 +61,15 @@ def to_connection_MINT(connection: Connection) -> str:
     Returns:
         str: This is the MINT string for the serialization
     """
+    # mint.g4 channelStat is `(entity | 'CHANNEL')`. The CHANNEL keyword is a
+    # distinct lexer token, so `ROUNDED CHANNEL name from ...` does not parse.
+    # Emit the CHANNEL keyword and carry the rounded 3DuF profile as crossSection.
+    entity = connection.entity or "CHANNEL"
+    mint_entity = "CHANNEL" if "ROUND" in str(entity).upper() else entity
+    if "ROUND" in str(entity).upper() and not connection.params.exists("crossSection"):
+        connection.params.set_param("crossSection", 1)
     ret = "{} {} from {} to {} {} ;".format(
-        connection.entity,
+        mint_entity,
         connection.ID,
         to_target_MINT(connection.source) if connection.source is not None else "",
         ", ".join([to_target_MINT(item) for item in connection.sinks]),