aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/com/jantuomi
diff options
context:
space:
mode:
authorjantuomi <jans.tuomi@gmail.com>2016-07-27 15:13:50 +0300
committerjantuomi <jans.tuomi@gmail.com>2016-07-27 15:13:50 +0300
commitd931e2a5a2ce40f215e3f6a86633e538bdb9a69d (patch)
tree131533bcb6e4f5fd36099178693424dd331975f8 /src/main/com/jantuomi
parent83453cc7d7321f5d4a8d2af7704d4237262a0857 (diff)
Fix include function
Diffstat (limited to 'src/main/com/jantuomi')
-rw-r--r--src/main/com/jantuomi/tunkki/core/runtime/builtins/IncludeBuiltinFunction.java3
1 files changed, 2 insertions, 1 deletions
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.");