From d1d5f45af01c31f55d4a5abd9fbbd19c3a0474f1 Mon Sep 17 00:00:00 2001
From: "Jurgen J. Vinju" <Jurgen.Vinju@cwi.nl>
Date: Wed, 29 Nov 2023 18:31:36 +0100
Subject: [PATCH] added support for identifiers

---
 src/org/rascalmpl/library/util/Explode.rsc | 29 ++++++++++++++++------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/org/rascalmpl/library/util/Explode.rsc b/src/org/rascalmpl/library/util/Explode.rsc
index 0a02bc39be0..54a177e7609 100644
--- a/src/org/rascalmpl/library/util/Explode.rsc
+++ b/src/org/rascalmpl/library/util/Explode.rsc
@@ -36,14 +36,26 @@ import Node;
 
 @synopsis{Turn an AST into a ParseTree, while preserving the name of the type.}
 syntax[&T] explode(data[&T] ast) {
-    assert ast.src?;
-    assert readFile(ast.src.top) == readFile(ast.src);
-    assert astNodeSpecification(ast);
+   assert ast.src?;
+   assert readFile(ast.src.top) == readFile(ast.src);
+   assert astNodeSpecification(ast);
 
-    return explode(typeOf(ast), ast, readFile(ast.src.top), ast.src.offset, ast.src.length);
+   if (syntax[&T] r := explode(typeOf(ast), ast, readFile(ast.src.top), ast.src.offset, ast.src.length)) {
+      return r;
+   }
+
+   throw "unexpected problem while exploding <ast>";
+}
+
+Tree explode(data[&T] ast:str label(str identifier), str contents, int offset, int length) {
+   return appl(prod(lex("identifier"),[\iter-star(\char-class([range(1,1114111)])],{}),
+      [
+         appl(regular(\iter-star(\char-class([range(1,1114111)]))),
+            [char(ch) | ch <- chars(contents[offset..offset+length])])
+      ]);
 }
 
-syntax[&T] explode(data[&T] ast, str contents, int offset, int length) {
+default Tree explode(data[&T] ast, str contents, int offset, int length) {
    children = getChildren(ast);
   
    // here we generate a quasi syntax rule that has the structure and the types
@@ -69,13 +81,16 @@ syntax[&T] explode(data[&T] ast, str contents, int offset, int length) {
       return r;
    }
    else {
-      throw "unexpected problem while exploding <ast>";
+     
    }
 }
 
 Tree separatorTree(str contents, int \start, int end)
    = appl(prod(layouts("separators"),[\iter-star(\char-class([range(1,1114111)])],{}),
-     [char(ch) | int ch <- chars(contents[\start..end]]))
+      [
+         appl(regular(\iter-star(\char-class([range(1,1114111)]))),
+            [char(ch) | int ch <- chars(contents[\start..end]])
+      ]);
 
 Symbol \syntax(str())           = \lex("*identifiers*");
 Symbol \syntax(\list(Symbol s)) = \iter-star(\syntax(s));
\ No newline at end of file