96 lines
4.0 KiB
Diff
96 lines
4.0 KiB
Diff
diff -Nru cookcc-0.3.3/src/freemarker/core/ActionCodeBI.java cookcc-0.3.3.freemarker/src/freemarker/core/ActionCodeBI.java
|
|
--- cookcc-0.3.3/src/freemarker/core/ActionCodeBI.java 2008-10-29 00:13:18.000000000 +0100
|
|
+++ cookcc-0.3.3.freemarker/src/freemarker/core/ActionCodeBI.java 2016-03-12 17:10:12.401069670 +0100
|
|
@@ -48,11 +48,11 @@
|
|
BuiltIn.builtins.put ("actioncode", new ActionCodeBI ());
|
|
}
|
|
|
|
- TemplateModel _getAsTemplateModel (Environment env) throws TemplateException
|
|
+ TemplateModel _eval (Environment env) throws TemplateException
|
|
{
|
|
- TemplateModel model = target.getAsTemplateModel (env);
|
|
- if (!(model instanceof StringModel))
|
|
- throw invalidTypeException (model, target, env, "string");
|
|
+ TemplateModel model = target.eval (env);
|
|
+ //if (!(model instanceof StringModel))
|
|
+ // throw invalidTypeException (model, target, env, "string");
|
|
StringModel seq = (StringModel)model;
|
|
return new ActionCodeBuilder (seq);
|
|
}
|
|
@@ -124,3 +124,4 @@
|
|
return ret;
|
|
}
|
|
}
|
|
+
|
|
diff -Nru cookcc-0.3.3/src/freemarker/core/HexBI.java cookcc-0.3.3.freemarker/src/freemarker/core/HexBI.java
|
|
--- cookcc-0.3.3/src/freemarker/core/HexBI.java 2008-10-15 19:10:55.000000000 +0200
|
|
+++ cookcc-0.3.3.freemarker/src/freemarker/core/HexBI.java 2016-03-12 16:41:22.184418305 +0100
|
|
@@ -44,11 +44,11 @@
|
|
BuiltIn.builtins.put ("hex", new HexBI ());
|
|
}
|
|
|
|
- TemplateModel _getAsTemplateModel (Environment env) throws TemplateException
|
|
+ TemplateModel _eval (Environment env) throws TemplateException
|
|
{
|
|
- TemplateModel model = target.getAsTemplateModel (env);
|
|
- if (!(model instanceof TemplateNumberModel))
|
|
- throw invalidTypeException (model, target, env, "number");
|
|
+ TemplateModel model = target.eval (env);
|
|
+ //if (!(model instanceof TemplateNumberModel))
|
|
+ // throw invalidTypeException (model, target, env, "number");
|
|
TemplateNumberModel nModel = (TemplateNumberModel)model;
|
|
return new Hexanizer (nModel.getAsNumber ().intValue ());
|
|
}
|
|
diff -Nru cookcc-0.3.3/src/freemarker/core/JavaStringBI.java cookcc-0.3.3.freemarker/src/freemarker/core/JavaStringBI.java
|
|
--- cookcc-0.3.3/src/freemarker/core/JavaStringBI.java 2008-10-27 22:57:00.000000000 +0100
|
|
+++ cookcc-0.3.3.freemarker/src/freemarker/core/JavaStringBI.java 2016-03-12 17:25:44.632644922 +0100
|
|
@@ -50,11 +50,11 @@
|
|
BuiltIn.builtins.put ("javastring", new JavaStringBI ());
|
|
}
|
|
|
|
- TemplateModel _getAsTemplateModel (Environment env) throws TemplateException
|
|
+ TemplateModel _eval (Environment env) throws TemplateException
|
|
{
|
|
- TemplateModel model = target.getAsTemplateModel (env);
|
|
- if (!(model instanceof ArrayModel))
|
|
- throw invalidTypeException (model, target, env, "array");
|
|
+ TemplateModel model = target.eval (env);
|
|
+ //if (!(model instanceof ArrayModel))
|
|
+ // throw invalidTypeException (model, target, env, "array");
|
|
ArrayModel seq = (ArrayModel)model;
|
|
return new JavaStringBuilder (seq);
|
|
}
|
|
@@ -105,4 +105,4 @@
|
|
return new SimpleScalar (buffer.toString ());
|
|
}
|
|
}
|
|
-}
|
|
\ Manca newline alla fine del file
|
|
+}
|
|
diff -Nru cookcc-0.3.3/src/freemarker/core/TypeBI.java cookcc-0.3.3.freemarker/src/freemarker/core/TypeBI.java
|
|
--- cookcc-0.3.3/src/freemarker/core/TypeBI.java 2008-10-29 00:13:18.000000000 +0100
|
|
+++ cookcc-0.3.3.freemarker/src/freemarker/core/TypeBI.java 2016-03-12 17:11:36.163541746 +0100
|
|
@@ -51,11 +51,11 @@
|
|
BuiltIn.builtins.put ("type", new TypeBI ());
|
|
}
|
|
|
|
- TemplateModel _getAsTemplateModel (Environment env) throws TemplateException
|
|
+ TemplateModel _eval (Environment env) throws TemplateException
|
|
{
|
|
- TemplateModel model = target.getAsTemplateModel (env);
|
|
- if (!(model instanceof BeanModel))
|
|
- throw invalidTypeException (model, target, env, "bean");
|
|
+ TemplateModel model = target.eval (env);
|
|
+ //if (!(model instanceof BeanModel))
|
|
+ // throw invalidTypeException (model, target, env, "bean");
|
|
BeanModel seq = (BeanModel)model;
|
|
return new TypeBuilder (seq);
|
|
}
|
|
@@ -139,4 +139,4 @@
|
|
}
|
|
return ret;
|
|
}
|
|
-}
|
|
\ Manca newline alla fine del file
|
|
+}
|