Tokenize commas.

llvm · Jun 19, 2024 · 15b0c09 · 15b0c09
1 parent ae89735
commit 15b0c09
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 31 deletions.
diff --git a/lib/Dialect/FIRRTL/Export/FIREmitter.cpp b/lib/Dialect/FIRRTL/Export/FIREmitter.cpp
@@ -1003,7 +1003,7 @@ void Emitter::emitStatement(SeqMemOp op) {
   ps.scopedBox(PP::ibox2, [&]() {
     ps << "smem " << PPExtString(legalize(op.getNameAttr()));
     emitTypeWithColon(op.getType());
-    ps << PP::space;
+    ps << "," << PP::space;
     emitAttribute(op.getRuw());
   });
   emitLocationAndNewLine(op);

diff --git a/lib/Dialect/FIRRTL/Import/FIRLexer.cpp b/lib/Dialect/FIRRTL/Import/FIRLexer.cpp
@@ -186,9 +186,7 @@ std::optional<unsigned> FIRLexer::getIndentation(const FIRToken &tok) const {
   // Count the number of horizontal whitespace characters before the token.
   auto *bufStart = curBuffer.begin();
 
-  auto isHorizontalWS = [](char c) -> bool {
-    return c == ' ' || c == '\t' || c == ',';
-  };
+  auto isHorizontalWS = [](char c) -> bool { return c == ' ' || c == '\t'; };
   auto isVerticalWS = [](char c) -> bool {
     return c == '\n' || c == '\r' || c == '\f' || c == '\v';
   };
@@ -233,7 +231,6 @@ FIRToken FIRLexer::lexTokenImpl() {
     case '\t':
     case '\n':
     case '\r':
-    case ',':
       // Handle whitespace.
       continue;
 
@@ -244,6 +241,8 @@ FIRToken FIRLexer::lexTokenImpl() {
 
     case '.':
       return formToken(FIRToken::period, tokStart);
+    case ',':
+      return formToken(FIRToken::comma, tokStart);
     case ':':
       return formToken(FIRToken::colon, tokStart);
     case '(':