From d931e2a5a2ce40f215e3f6a86633e538bdb9a69d Mon Sep 17 00:00:00 2001
From: jantuomi <jans.tuomi@gmail.com>
Date: Wed, 27 Jul 2016 15:13:50 +0300
Subject: Fix include function

---
 .../jantuomi/tunkki/core/runtime/builtins/IncludeBuiltinFunction.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/com/jantuomi/tunkki/core/runtime/builtins/IncludeBuiltinFunction.java b/src/main/com/jantuomi/tunkki/core/runtime/builtins/IncludeBuiltinFunction.java
index 8b1781e..5f63996 100644
--- a/src/main/com/jantuomi/tunkki/core/runtime/builtins/IncludeBuiltinFunction.java
+++ b/src/main/com/jantuomi/tunkki/core/runtime/builtins/IncludeBuiltinFunction.java
@@ -39,7 +39,8 @@ public class IncludeBuiltinFunction extends BuiltinFunction {
             return null;
         }
 
-        Pattern pattern = Pattern.compile("include\\s*\\(\\s*\\\"moikka\\\"\\s*\\)", Pattern.DOTALL);
+        String regex = String.format(".*include\\?\\s+\"\\s?%s\\s?\"\\s?\\!.*", Pattern.quote(filename));
+        Pattern pattern = Pattern.compile(regex, Pattern.DOTALL);
         Matcher matcher = pattern.matcher(contents);
         if (matcher.matches()) {
             ExceptionManager.raise(TunkkiError.ExceptionType.GeneralError, -1, "Recursive include detected, aborting.");
-- 
cgit v1.3