add MacroProcessor before input lphy script into parser #420

LinguaPhylo · Nov 29, 2023 · 6bba71e · 6bba71e
1 parent 1e9983e
commit 6bba71e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/examples/macro/MacroLanguage.lphy b/examples/macro/MacroLanguage.lphy
@@ -0,0 +1,8 @@
+data {
+  L = {{L = 100}};
+  taxa = taxa(names=1:{{n = 10}});
+}
+model {
+  ψ ~ Coalescent(theta=10, taxa=taxa);
+  D ~ PhyloCTMC(tree=ψ, L=L, Q=jukesCantor());
+}
diff --git a/lphy/src/main/java/lphy/core/parser/LPhyParserDictionary.java b/lphy/src/main/java/lphy/core/parser/LPhyParserDictionary.java
@@ -1,6 +1,7 @@
 package lphy.core.parser;
 
 import lphy.core.exception.SimulatorParsingException;
+import lphy.core.io.MacroProcessor;
 import lphy.core.model.ExpressionUtils;
 import lphy.core.model.Value;
 import lphy.core.model.datatype.DoubleValue;
@@ -92,13 +93,18 @@ default void source(File sourceFile) throws IOException {
     default void source(BufferedReader bufferedReader) throws IOException {
         StringBuilder builder = new StringBuilder();
 
+        String lineProcessed;
         String line = bufferedReader.readLine();
         while (line != null) {
-            builder.append(line);
+            // process macro here
+            lineProcessed = MacroProcessor.process(line);
+            builder.append(lineProcessed);
             builder.append("\n");
+
             line = bufferedReader.readLine();
         }
         bufferedReader.close();
+        // after macro processed
         parse(builder.toString());
     }