freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [33/54] [partial] incubator-freemarker git commit: Unifying the o.a.f.core and o.a.f.core.ast
Date Thu, 23 Feb 2017 21:36:00 GMT
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/_ObjectBuilderSettingEvaluator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/_ObjectBuilderSettingEvaluator.java b/src/main/java/org/apache/freemarker/core/_ObjectBuilderSettingEvaluator.java
new file mode 100644
index 0000000..c74bfbc
--- /dev/null
+++ b/src/main/java/org/apache/freemarker/core/_ObjectBuilderSettingEvaluator.java
@@ -0,0 +1,1057 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.freemarker.core;
+
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.freemarker.core.model.TemplateHashModel;
+import org.apache.freemarker.core.model.TemplateMethodModelEx;
+import org.apache.freemarker.core.model.TemplateModel;
+import org.apache.freemarker.core.model.TemplateModelException;
+import org.apache.freemarker.core.model.impl.DefaultObjectWrapper;
+import org.apache.freemarker.core.model.impl.SimpleObjectWrapper;
+import org.apache.freemarker.core.model.impl.beans.BeansWrapper;
+import org.apache.freemarker.core.templateresolver.AndMatcher;
+import org.apache.freemarker.core.templateresolver.ConditionalTemplateConfigurationFactory;
+import org.apache.freemarker.core.templateresolver.FileExtensionMatcher;
+import org.apache.freemarker.core.templateresolver.FileNameGlobMatcher;
+import org.apache.freemarker.core.templateresolver.FirstMatchTemplateConfigurationFactory;
+import org.apache.freemarker.core.templateresolver.MergingTemplateConfigurationFactory;
+import org.apache.freemarker.core.templateresolver.NotMatcher;
+import org.apache.freemarker.core.templateresolver.OrMatcher;
+import org.apache.freemarker.core.templateresolver.PathGlobMatcher;
+import org.apache.freemarker.core.templateresolver.PathRegexMatcher;
+import org.apache.freemarker.core.util.BugException;
+import org.apache.freemarker.core.util.FTLUtil;
+import org.apache.freemarker.core.util.GenericParseException;
+import org.apache.freemarker.core.util.WriteProtectable;
+import org.apache.freemarker.core.util._ClassUtil;
+import org.apache.freemarker.core.util._StringUtil;
+
+/**
+ * Don't use this; used internally by FreeMarker, might changes without notice.
+ * 
+ * Evaluates object builder expressions used in configuration {@link Properties}.
+ * It should be replaced with FTL later (when it was improved to be practical for this), so the syntax should be
+ * a subset of the future FTL syntax. This is also why this syntax is restrictive; it shouldn't accept anything that
+ * FTL will not.
+ */
+// Java 5: use generics for expectedClass
+// Java 5: Introduce ObjectBuilder interface
+public class _ObjectBuilderSettingEvaluator {
+    
+    private static final String INSTANCE_FIELD_NAME = "INSTANCE";
+
+    private static final String BUILD_METHOD_NAME = "build";
+
+    private static final String BUILDER_CLASS_POSTFIX = "Builder";
+
+    private static Map<String,String> SHORTHANDS;
+    
+    private static final Object VOID = new Object();
+
+    private final String src;
+    private final Class expectedClass;
+    private final boolean allowNull;
+    private final _SettingEvaluationEnvironment env;
+
+    // Parser state:
+    private int pos;
+    
+    private _ObjectBuilderSettingEvaluator(
+            String src, int pos, Class expectedClass, boolean allowNull, _SettingEvaluationEnvironment env) {
+        this.src = src;
+        this.pos = pos;
+        this.expectedClass = expectedClass;
+        this.allowNull = allowNull;
+        this.env = env;
+    }
+
+    public static Object eval(String src, Class expectedClass, boolean allowNull, _SettingEvaluationEnvironment env)
+            throws _ObjectBuilderSettingEvaluationException,
+            ClassNotFoundException, InstantiationException, IllegalAccessException {
+        return new _ObjectBuilderSettingEvaluator(src, 0, expectedClass, allowNull, env).eval();
+    }
+
+    /**
+     * Used for getting a list of setting assignments (like {@code (x=1, y=2)}) from an existing string, and apply it on
+     * an existing bean.
+     * 
+     * @return The location of the next character to process.
+     */
+    public static int configureBean(
+            String argumentListSrc, int posAfterOpenParen, Object bean, _SettingEvaluationEnvironment env)
+            throws _ObjectBuilderSettingEvaluationException,
+            ClassNotFoundException, InstantiationException, IllegalAccessException {
+        return new _ObjectBuilderSettingEvaluator(
+                argumentListSrc, posAfterOpenParen, bean.getClass(), true, env).configureBean(bean);
+    }
+    
+    private Object eval() throws _ObjectBuilderSettingEvaluationException,
+            ClassNotFoundException, InstantiationException, IllegalAccessException {
+        Object value;
+        
+        skipWS();
+        value = ensureEvaled(fetchValue(false, true, false, true));
+        skipWS();
+        
+        if (pos != src.length()) {
+            throw new _ObjectBuilderSettingEvaluationException("end-of-expression", src, pos);
+        }
+        
+        if (value == null && !allowNull) {
+            throw new _ObjectBuilderSettingEvaluationException("Value can't be null.");
+        }
+        if (value != null && !expectedClass.isInstance(value)) {
+            throw new _ObjectBuilderSettingEvaluationException("The resulting object (of class "
+                    + value.getClass() + ") is not a(n) " + expectedClass.getName() + ".");
+        }
+        
+        return value;
+    }
+    
+    private int configureBean(Object bean) throws _ObjectBuilderSettingEvaluationException,
+            ClassNotFoundException, InstantiationException, IllegalAccessException {
+        final PropertyAssignmentsExpression propAssignments = new PropertyAssignmentsExpression(bean);
+        fetchParameterListInto(propAssignments);
+        skipWS();
+        propAssignments.eval();
+        return pos;
+    }
+
+    private Object ensureEvaled(Object value) throws _ObjectBuilderSettingEvaluationException {
+        return value instanceof SettingExpression ? ((SettingExpression) value).eval() : value;
+    }
+
+    private Object fetchBuilderCall(boolean optional, boolean topLevel)
+            throws _ObjectBuilderSettingEvaluationException {
+        int startPos = pos;
+        
+        BuilderCallExpression exp = new BuilderCallExpression();
+        // We need the canBeStaticField/mustBeStaticFiled complication to deal with legacy syntax where parentheses
+        // weren't required for constructor calls.
+        exp.canBeStaticField = true;
+        
+        final String fetchedClassName = fetchClassName(optional);
+        {
+            if (fetchedClassName == null) {
+                if (!optional) {
+                    throw new _ObjectBuilderSettingEvaluationException("class name", src, pos);
+                }
+                return VOID;
+            }
+            exp.className = shorthandToFullQualified(fetchedClassName);
+            if (!fetchedClassName.equals(exp.className)) {
+                exp.canBeStaticField = false;
+            }
+        }
+        
+        skipWS();
+        
+        char openParen = fetchOptionalChar("(");
+        // Only the top-level expression can omit the "(...)"
+        if (openParen == 0 && !topLevel) {
+            if (fetchedClassName.indexOf('.') != -1) {
+                exp.mustBeStaticField = true;
+            } else {
+                pos = startPos;
+                return VOID;
+            }
+        }
+    
+        if (openParen != 0) {
+            fetchParameterListInto(exp);
+            exp.canBeStaticField = false;
+        }
+        
+        return exp;
+    }
+
+    private void fetchParameterListInto(ExpressionWithParameters exp) throws _ObjectBuilderSettingEvaluationException {
+        skipWS();
+        if (fetchOptionalChar(")") != ')') { 
+            do {
+                skipWS();
+                
+                Object paramNameOrValue = fetchValue(false, false, true, false);
+                if (paramNameOrValue != VOID) {
+                    skipWS();
+                    if (paramNameOrValue instanceof Name) {
+                        exp.namedParamNames.add(((Name) paramNameOrValue).name);
+                        
+                        skipWS();
+                        fetchRequiredChar("=");
+                        skipWS();
+                        
+                        Object paramValue = fetchValue(false, false, true, true);
+                        exp.namedParamValues.add(ensureEvaled(paramValue));
+                    } else {
+                        if (!exp.namedParamNames.isEmpty()) {
+                            throw new _ObjectBuilderSettingEvaluationException(
+                                    "Positional parameters must precede named parameters");
+                        }
+                        if (!exp.getAllowPositionalParameters()) {
+                            throw new _ObjectBuilderSettingEvaluationException(
+                                    "Positional parameters not supported here");
+                        }
+                        exp.positionalParamValues.add(ensureEvaled(paramNameOrValue));
+                    }
+                    
+                    skipWS();
+                }
+            } while (fetchRequiredChar(",)") == ',');
+        }
+    }
+
+    private Object fetchValue(boolean optional, boolean topLevel, boolean resultCoerced, boolean resolveVariables)
+            throws _ObjectBuilderSettingEvaluationException {
+        if (pos < src.length()) {
+            Object val = fetchNumberLike(true, resultCoerced);
+            if (val != VOID) {
+                return val;
+            }
+    
+            val = fetchStringLiteral(true);
+            if (val != VOID) {
+                return val;
+            }
+
+            val = fetchListLiteral(true);
+            if (val != VOID) {
+                return val;
+            }
+
+            val = fetchMapLiteral(true);
+            if (val != VOID) {
+                return val;
+            }
+            
+            val = fetchBuilderCall(true, topLevel);
+            if (val != VOID) {
+                return val;
+            }
+            
+            String name = fetchSimpleName(true);
+            if (name != null) {
+                val = keywordToValueOrVoid(name);
+                if (val != VOID) {
+                    return val;
+                }
+                
+                if (resolveVariables) {
+                    // Not supported currently...
+                    throw new _ObjectBuilderSettingEvaluationException("Can't resolve variable reference: " + name);
+                } else {
+                    return new Name(name);
+                }
+            }
+        }
+        
+        if (optional) {
+            return VOID;
+        } else {
+            throw new _ObjectBuilderSettingEvaluationException("value or name", src, pos);
+        }
+    }
+
+    private boolean isKeyword(String name) {
+        return keywordToValueOrVoid(name) != VOID;
+    }
+    
+    private Object keywordToValueOrVoid(String name) {
+        if (name.equals("true")) return Boolean.TRUE;
+        if (name.equals("false")) return Boolean.FALSE;
+        if (name.equals("null")) return null;
+        return VOID;
+    }
+
+    private String fetchSimpleName(boolean optional) throws _ObjectBuilderSettingEvaluationException {
+        char c = pos < src.length() ? src.charAt(pos) : 0;
+        if (!isIdentifierStart(c)) {
+            if (optional) {
+                return null;
+            } else {
+                throw new _ObjectBuilderSettingEvaluationException("class name", src, pos);
+            }
+        }
+        int startPos = pos;
+        pos++;
+        
+        seekClassNameEnd: while (true) {
+            if (pos == src.length()) {
+                break seekClassNameEnd;
+            }
+            c = src.charAt(pos);
+            if (!isIdentifierMiddle(c)) {
+                break seekClassNameEnd;
+            }
+            pos++;
+        }
+        
+        return src.substring(startPos, pos);
+    }
+
+    private String fetchClassName(boolean optional) throws _ObjectBuilderSettingEvaluationException {
+        int startPos = pos;
+        StringBuilder sb = new StringBuilder();
+        do {
+            String name = fetchSimpleName(true);
+            if (name == null) {
+                if (!optional) {
+                    throw new _ObjectBuilderSettingEvaluationException("name", src, pos);
+                } else {
+                    pos = startPos;
+                    return null;
+                }
+            }
+            sb.append(name);
+            
+            skipWS();
+            
+            if (pos >= src.length() || src.charAt(pos) != '.') {
+                break;
+            }
+            sb.append('.');
+            pos++;
+            
+            skipWS();
+        } while (true);
+        
+        String className = sb.toString();
+        if (isKeyword(className)) {
+            pos = startPos;
+            return null;
+        }
+        return className;
+    }
+
+    private Object fetchNumberLike(boolean optional, boolean resultCoerced)
+            throws _ObjectBuilderSettingEvaluationException {
+        int startPos = pos;
+        boolean isVersion = false;
+        boolean hasDot = false;
+        seekTokenEnd: while (true) {
+            if (pos == src.length()) {
+                break seekTokenEnd;
+            }
+            char c = src.charAt(pos);
+            if (c == '.') {
+                if (hasDot) {
+                    // More than one dot
+                    isVersion = true;
+                } else {
+                    hasDot = true;
+                }
+            } else if (!(isASCIIDigit(c) || c == '-')) {
+                break seekTokenEnd;
+            }
+            pos++;
+        }
+        
+        if (startPos == pos) {
+            if (optional) {
+                return VOID;
+            } else {
+                throw new _ObjectBuilderSettingEvaluationException("number-like", src, pos);
+            }
+        }
+        
+        String numStr = src.substring(startPos, pos);
+        if (isVersion) {
+            try {
+                return new Version(numStr);
+            } catch (IllegalArgumentException e) {
+                throw new _ObjectBuilderSettingEvaluationException("Malformed version number: " + numStr, e);
+            }
+        } else {
+            // For example, in 1.0f, numStr is "1.0", and typePostfix is "f".
+            String typePostfix = null;
+            seekTypePostfixEnd: while (true) {
+                if (pos == src.length()) {
+                    break seekTypePostfixEnd;
+                }
+                char c = src.charAt(pos);
+                if (Character.isLetter(c)) {
+                    if (typePostfix == null) {
+                        typePostfix = String.valueOf(c);
+                    } else {
+                        typePostfix += c; 
+                    }
+                } else {
+                    break seekTypePostfixEnd;
+                }
+                pos++;
+            }
+            
+            try {
+                if (numStr.endsWith(".")) {
+                    throw new NumberFormatException("A number can't end with a dot");
+                }
+                if (numStr.startsWith(".") || numStr.startsWith("-.")  || numStr.startsWith("+.")) {
+                    throw new NumberFormatException("A number can't start with a dot");
+                }
+
+                if (typePostfix == null) {
+                    // Auto-detect type
+                    if (numStr.indexOf('.') == -1) {
+                        BigInteger biNum = new BigInteger(numStr);
+                        final int bitLength = biNum.bitLength();  // Doesn't include sign bit
+                        if (bitLength <= 31) {
+                            return Integer.valueOf(biNum.intValue());
+                        } else if (bitLength <= 63) {
+                            return Long.valueOf(biNum.longValue());
+                        } else {
+                            return biNum;
+                        }
+                    } else {
+                        if (resultCoerced) {
+                            // The FTL way (BigDecimal is loseless, and it will be coerced to the target type later):
+                            return new BigDecimal(numStr);
+                        } else {
+                            // The Java way (lossy but familiar):
+                            return Double.valueOf(numStr);
+                        }
+                    }
+                } else { // Has explicitly specified type
+                    if (typePostfix.equalsIgnoreCase("l")) {
+                        return Long.valueOf(numStr);
+                    } else if (typePostfix.equalsIgnoreCase("bi")) {
+                        return new BigInteger(numStr);
+                    } else if (typePostfix.equalsIgnoreCase("bd")) {
+                        return new BigDecimal(numStr);
+                    } else if (typePostfix.equalsIgnoreCase("d")) {
+                        return Double.valueOf(numStr);
+                    } else if (typePostfix.equalsIgnoreCase("f")) {
+                        return Float.valueOf(numStr);
+                    } else {
+                        throw new _ObjectBuilderSettingEvaluationException(
+                                "Unrecognized number type postfix: " + typePostfix);
+                    }
+                }
+                
+            } catch (NumberFormatException e) {
+                throw new _ObjectBuilderSettingEvaluationException("Malformed number: " + numStr, e);
+            }
+        }
+    }
+
+    private Object fetchStringLiteral(boolean optional) throws _ObjectBuilderSettingEvaluationException {
+        int startPos = pos;
+        char q = 0;
+        boolean afterEscape = false;
+        boolean raw = false;
+        seekTokenEnd: while (true) {
+            if (pos == src.length()) {
+                if (q != 0) {
+                    // We had an open quotation
+                    throw new _ObjectBuilderSettingEvaluationException(String.valueOf(q), src, pos);
+                }
+                break seekTokenEnd;
+            }
+            char c = src.charAt(pos);
+            if (q == 0) {
+                if (c == 'r' && (pos + 1 < src.length())) {
+                    // Maybe it's like r"foo\bar"
+                    raw = true;
+                    c = src.charAt(pos + 1);
+                }
+                if (c == '\'') {
+                    q = '\'';
+                } else if (c == '"') {
+                    q = '"';
+                } else {
+                    break seekTokenEnd;
+                }
+                if (raw) {
+                    // because of the preceding "r"
+                    pos++;
+                }
+            } else {
+                if (!afterEscape) {
+                    if (c == '\\' && !raw) {
+                        afterEscape = true;
+                    } else if (c == q) {
+                        break seekTokenEnd;
+                    } else if (c == '{') {
+                        char prevC = src.charAt(pos - 1);
+                        if (prevC == '$' || prevC == '#') {
+                            throw new _ObjectBuilderSettingEvaluationException(
+                                    "${...} and #{...} aren't allowed here.");
+                        }
+                    }
+                } else {
+                    afterEscape = false;
+                }
+            }
+            pos++;
+        }
+        if (startPos == pos) {
+            if (optional) {
+                return VOID;
+            } else {
+                throw new _ObjectBuilderSettingEvaluationException("string literal", src, pos);
+            }
+        }
+            
+        final String sInside = src.substring(startPos + (raw ? 2 : 1), pos);
+        try {
+            pos++; // skip closing quotation mark
+            return raw ? sInside : FTLUtil.unescapeStringLiteralPart(sInside);
+        } catch (GenericParseException e) {
+            throw new _ObjectBuilderSettingEvaluationException("Malformed string literal: " + sInside, e);
+        }
+    }
+
+    private Object fetchListLiteral(boolean optional) throws _ObjectBuilderSettingEvaluationException {
+        if (pos == src.length() || src.charAt(pos) != '[') {
+            if (!optional) {
+                throw new _ObjectBuilderSettingEvaluationException("[", src, pos);
+            }
+            return VOID;
+        }
+        pos++;
+        
+        ListExpression listExp = new ListExpression();
+        
+        while (true) {
+            skipWS();
+            
+            if (fetchOptionalChar("]") != 0) {
+                return listExp;
+            }
+            if (listExp.itemCount() != 0) {
+                fetchRequiredChar(",");
+                skipWS();
+            }
+            
+            listExp.addItem(fetchValue(false, false, false, true));
+            
+            skipWS();
+        }
+    }
+
+    private Object fetchMapLiteral(boolean optional) throws _ObjectBuilderSettingEvaluationException {
+        if (pos == src.length() || src.charAt(pos) != '{') {
+            if (!optional) {
+                throw new _ObjectBuilderSettingEvaluationException("{", src, pos);
+            }
+            return VOID;
+        }
+        pos++;
+        
+        MapExpression mapExp = new MapExpression();
+        
+        while (true) {
+            skipWS();
+            
+            if (fetchOptionalChar("}") != 0) {
+                return mapExp;
+            }
+            if (mapExp.itemCount() != 0) {
+                fetchRequiredChar(",");
+                skipWS();
+            }
+            
+            Object key = fetchValue(false, false, false, true);
+            skipWS();
+            fetchRequiredChar(":");
+            skipWS();
+            Object value = fetchValue(false, false, false, true);
+            mapExp.addItem(new KeyValuePair(key, value));
+            
+            skipWS();
+        }
+    }
+    
+    private void skipWS() {
+        while (true) {
+            if (pos == src.length()) {
+                return;
+            }
+            char c = src.charAt(pos);
+            if (!Character.isWhitespace(c)) {
+                return;
+            }
+            pos++;
+        }
+    }
+
+    private char fetchOptionalChar(String expectedChars) throws _ObjectBuilderSettingEvaluationException {
+        return fetchChar(expectedChars, true);
+    }
+    
+    private char fetchRequiredChar(String expectedChars) throws _ObjectBuilderSettingEvaluationException {
+        return fetchChar(expectedChars, false);
+    }
+    
+    private char fetchChar(String expectedChars, boolean optional) throws _ObjectBuilderSettingEvaluationException {
+        char c = pos < src.length() ? src.charAt(pos) : 0;
+        if (expectedChars.indexOf(c) != -1) {
+            pos++;
+            return c;
+        } else if (optional) {
+            return 0;
+        } else {
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < expectedChars.length(); i++) {
+                if (i != 0) {
+                    sb.append(" or ");
+                }
+                sb.append(_StringUtil.jQuote(expectedChars.substring(i, i + 1)));
+            }
+            throw new _ObjectBuilderSettingEvaluationException(
+                    sb.toString(),
+                    src, pos);
+        }
+    }
+    
+    private boolean isASCIIDigit(char c) {
+        return c >= '0' && c <= '9';
+    }
+
+    private boolean isIdentifierStart(char c) {
+        return Character.isLetter(c) || c == '_' || c == '$';
+    }
+
+    private boolean isIdentifierMiddle(char c) {
+        return isIdentifierStart(c) || isASCIIDigit(c);
+    }
+
+    private static synchronized String shorthandToFullQualified(String className) {
+        if (SHORTHANDS == null) {
+            SHORTHANDS = new HashMap/*<String,String>*/();
+            
+            addWithSimpleName(SHORTHANDS, DefaultObjectWrapper.class);
+            addWithSimpleName(SHORTHANDS, BeansWrapper.class);
+            addWithSimpleName(SHORTHANDS, SimpleObjectWrapper.class);
+
+            addWithSimpleName(SHORTHANDS, TemplateConfiguration.class);
+            
+            addWithSimpleName(SHORTHANDS, PathGlobMatcher.class);
+            addWithSimpleName(SHORTHANDS, FileNameGlobMatcher.class);
+            addWithSimpleName(SHORTHANDS, FileExtensionMatcher.class);
+            addWithSimpleName(SHORTHANDS, PathRegexMatcher.class);
+            addWithSimpleName(SHORTHANDS, AndMatcher.class);
+            addWithSimpleName(SHORTHANDS, OrMatcher.class);
+            addWithSimpleName(SHORTHANDS, NotMatcher.class);
+            
+            addWithSimpleName(SHORTHANDS, ConditionalTemplateConfigurationFactory.class);
+            addWithSimpleName(SHORTHANDS, MergingTemplateConfigurationFactory.class);
+            addWithSimpleName(SHORTHANDS, FirstMatchTemplateConfigurationFactory.class);
+
+            addWithSimpleName(SHORTHANDS, HTMLOutputFormat.class);
+            addWithSimpleName(SHORTHANDS, XMLOutputFormat.class);
+            addWithSimpleName(SHORTHANDS, RTFOutputFormat.class);
+            addWithSimpleName(SHORTHANDS, PlainTextOutputFormat.class);
+            addWithSimpleName(SHORTHANDS, UndefinedOutputFormat.class);
+            
+            addWithSimpleName(SHORTHANDS, Locale.class);
+            String tzbClassName = _TimeZoneBuilder.class.getName();
+            SHORTHANDS.put("TimeZone", tzbClassName.substring(0, tzbClassName.length() - 7));
+
+            // For accessing static fields:
+            addWithSimpleName(SHORTHANDS, Configuration.class);
+        }
+        String fullClassName = SHORTHANDS.get(className);
+        return fullClassName == null ? className : fullClassName;
+    }
+    
+    private static void addWithSimpleName(Map map, Class<?> pClass) {
+        map.put(pClass.getSimpleName(), pClass.getName());
+    }
+
+    private void setJavaBeanProperties(Object bean,
+            List/*<String>*/ namedParamNames, List/*<Object>*/ namedParamValues)
+            throws _ObjectBuilderSettingEvaluationException {
+        if (namedParamNames.isEmpty()) {
+            return;
+        }
+        
+        final Class cl = bean.getClass();
+        Map/*<String,Method>*/ beanPropSetters;
+        try {
+            PropertyDescriptor[] propDescs = Introspector.getBeanInfo(cl).getPropertyDescriptors();
+            beanPropSetters = new HashMap(propDescs.length * 4 / 3, 1.0f);
+            for (PropertyDescriptor propDesc : propDescs) {
+                final Method writeMethod = propDesc.getWriteMethod();
+                if (writeMethod != null) {
+                    beanPropSetters.put(propDesc.getName(), writeMethod);
+                }
+            }
+        } catch (Exception e) {
+            throw new _ObjectBuilderSettingEvaluationException("Failed to inspect " + cl.getName() + " class", e);
+        }
+
+        TemplateHashModel beanTM = null;
+        for (int i = 0; i < namedParamNames.size(); i++) {
+            String name = (String) namedParamNames.get(i);
+            if (!beanPropSetters.containsKey(name)) {
+                throw new _ObjectBuilderSettingEvaluationException(
+                        "The " + cl.getName() + " class has no writeable JavaBeans property called "
+                        + _StringUtil.jQuote(name) + ".");
+            }
+            
+            Method beanPropSetter = (Method) beanPropSetters.put(name, null);
+            if (beanPropSetter == null) {
+                    throw new _ObjectBuilderSettingEvaluationException(
+                            "JavaBeans property " + _StringUtil.jQuote(name) + " is set twice.");
+            }
+            
+            try {
+                if (beanTM == null) {
+                    TemplateModel wrappedObj = env.getObjectWrapper().wrap(bean);
+                    if (!(wrappedObj instanceof TemplateHashModel)) {
+                        throw new _ObjectBuilderSettingEvaluationException(
+                                "The " + cl.getName() + " class is not a wrapped as TemplateHashModel.");
+                    }
+                    beanTM = (TemplateHashModel) wrappedObj;
+                }
+                
+                TemplateModel m = beanTM.get(beanPropSetter.getName());
+                if (m == null) {
+                    throw new _ObjectBuilderSettingEvaluationException(
+                            "Can't find " + beanPropSetter + " as FreeMarker method.");
+                }
+                if (!(m instanceof TemplateMethodModelEx)) {
+                    throw new _ObjectBuilderSettingEvaluationException(
+                            _StringUtil.jQuote(beanPropSetter.getName()) + " wasn't a TemplateMethodModelEx.");
+                }
+                List/*TemplateModel*/ args = new ArrayList();
+                args.add(env.getObjectWrapper().wrap(namedParamValues.get(i)));
+                ((TemplateMethodModelEx) m).exec(args);
+            } catch (Exception e) {
+                throw new _ObjectBuilderSettingEvaluationException(
+                        "Failed to set " + _StringUtil.jQuote(name), e);
+            }
+        }
+    }
+
+    private static class Name {
+        
+        public Name(String name) {
+            this.name = name;
+        }
+
+        private final String name;
+    }
+    
+    private abstract static class SettingExpression {
+        abstract Object eval() throws _ObjectBuilderSettingEvaluationException;
+    }
+    
+    private abstract class ExpressionWithParameters extends SettingExpression {
+        protected List positionalParamValues = new ArrayList();
+        protected List/*<String>*/ namedParamNames = new ArrayList();
+        protected List/*<Object>*/ namedParamValues = new ArrayList();
+        
+        protected abstract boolean getAllowPositionalParameters();
+    }
+    
+    private class ListExpression extends SettingExpression {
+        
+        private List<Object> items = new ArrayList();
+        
+        void addItem(Object item) {
+            items.add(item);
+        }
+
+        public int itemCount() {
+            return items.size();
+        }
+
+        @Override
+        Object eval() throws _ObjectBuilderSettingEvaluationException {
+            ArrayList res = new ArrayList(items.size());
+            for (Object item : items) {
+                res.add(ensureEvaled(item));
+            }
+            return res;
+        }
+        
+    }
+    
+    private class MapExpression extends SettingExpression {
+        
+        private List<KeyValuePair> items = new ArrayList();
+        
+        void addItem(KeyValuePair item) {
+            items.add(item);
+        }
+
+        public int itemCount() {
+            return items.size();
+        }
+
+        @Override
+        Object eval() throws _ObjectBuilderSettingEvaluationException {
+            LinkedHashMap res = new LinkedHashMap(items.size() * 4 / 3, 1f);
+            for (KeyValuePair item : items) {
+                Object key = ensureEvaled(item.key);
+                if (key == null) {
+                    throw new _ObjectBuilderSettingEvaluationException("Map can't use null as key.");
+                }
+                res.put(key, ensureEvaled(item.value));
+            }
+            return res;
+        }
+        
+    }
+    
+    private static class KeyValuePair {
+        private final Object key;
+        private final Object value;
+        
+        public KeyValuePair(Object key, Object value) {
+            this.key = key;
+            this.value = value;
+        }
+    }
+    
+    private class BuilderCallExpression extends ExpressionWithParameters {
+        private String className;
+        private boolean canBeStaticField;
+        private boolean mustBeStaticField;
+        
+        @Override
+        Object eval() throws _ObjectBuilderSettingEvaluationException {
+            if (mustBeStaticField) {
+                if (!canBeStaticField) {
+                    throw new BugException();
+                }
+                return getStaticFieldValue(className);
+            }
+            
+            Class cl;
+            
+            boolean clIsBuilderClass;
+            try {
+                cl = _ClassUtil.forName(className + BUILDER_CLASS_POSTFIX);
+                clIsBuilderClass = true;
+            } catch (ClassNotFoundException e) {
+                clIsBuilderClass = false;
+                try {
+                    cl = _ClassUtil.forName(className);
+                } catch (Exception e2) {
+                    boolean failedToGetAsStaticField;
+                    if (canBeStaticField) {
+                        // Try to interpret className as static filed: 
+                        try {
+                            return getStaticFieldValue(className);
+                        } catch (_ObjectBuilderSettingEvaluationException e3) {
+                            // Suppress it
+                            failedToGetAsStaticField = true;
+                        }
+                    } else {
+                        failedToGetAsStaticField = false;
+                    }
+                    throw new _ObjectBuilderSettingEvaluationException(
+                            "Failed to get class " + _StringUtil.jQuote(className)
+                            + (failedToGetAsStaticField ? " (also failed to resolve name as static field)" : "")
+                            + ".",
+                            e2);
+                }
+            }
+            
+            if (!clIsBuilderClass && hasNoParameters()) {
+                try {
+                    Field f = cl.getField(INSTANCE_FIELD_NAME);
+                    if ((f.getModifiers() & (Modifier.PUBLIC | Modifier.STATIC))
+                            == (Modifier.PUBLIC | Modifier.STATIC)) {
+                        return f.get(null);
+                    }
+                } catch (NoSuchFieldException e) {
+                    // Expected
+                } catch (Exception e) {
+                    throw new _ObjectBuilderSettingEvaluationException(
+                            "Error when trying to access " + _StringUtil.jQuote(className) + "."
+                            + INSTANCE_FIELD_NAME, e);
+                }
+            }
+            
+            // Create the object to return or its builder:
+            Object constructorResult = callConstructor(cl);
+            
+            // Named parameters will set JavaBeans properties:
+            setJavaBeanProperties(constructorResult, namedParamNames, namedParamValues);
+
+            final Object result;
+            if (clIsBuilderClass) {
+                result = callBuild(constructorResult);
+            } else {
+                if (constructorResult instanceof WriteProtectable) {
+                    ((WriteProtectable) constructorResult).writeProtect();
+                }
+                result = constructorResult;
+            }
+            
+            return result;
+        }
+        
+        private Object getStaticFieldValue(String dottedName) throws _ObjectBuilderSettingEvaluationException {
+            int lastDotIdx = dottedName.lastIndexOf('.');
+            if (lastDotIdx == -1) {
+                throw new IllegalArgumentException();
+            }
+            String className = shorthandToFullQualified(dottedName.substring(0, lastDotIdx));
+            String fieldName = dottedName.substring(lastDotIdx + 1);
+
+            Class<?> cl;
+            try {
+                cl = _ClassUtil.forName(className);
+            } catch (Exception e) {
+                throw new _ObjectBuilderSettingEvaluationException(
+                        "Failed to get field's parent class, " + _StringUtil.jQuote(className) + ".",
+                        e);
+            }
+            
+            Field field;
+            try {
+                field = cl.getField(fieldName);
+            } catch (Exception e) {
+                throw new _ObjectBuilderSettingEvaluationException(
+                        "Failed to get field " + _StringUtil.jQuote(fieldName) + " from class "
+                        + _StringUtil.jQuote(className) + ".",
+                        e);
+            }
+            
+            if ((field.getModifiers() & Modifier.STATIC) == 0) {
+                throw new _ObjectBuilderSettingEvaluationException("Referred field isn't static: " + field);
+            }
+            if ((field.getModifiers() & Modifier.PUBLIC) == 0) {
+                throw new _ObjectBuilderSettingEvaluationException("Referred field isn't public: " + field);
+            }
+
+            if (field.getName().equals(INSTANCE_FIELD_NAME)) {
+                throw new _ObjectBuilderSettingEvaluationException(
+                        "The " + INSTANCE_FIELD_NAME + " field is only accessible through pseudo-constructor call: "
+                        + className + "()");
+            }
+            
+            try {
+                return field.get(null);
+            } catch (Exception e) {
+                throw new _ObjectBuilderSettingEvaluationException("Failed to get field value: " + field, e);
+            }
+        }
+
+        private Object callConstructor(Class cl)
+                throws _ObjectBuilderSettingEvaluationException {
+            if (hasNoParameters()) {
+                // No need to create ObjectWrapper
+                try {
+                    return cl.newInstance();
+                } catch (Exception e) {
+                    throw new _ObjectBuilderSettingEvaluationException(
+                            "Failed to call " + cl.getName() + " 0-argument constructor", e);
+                }
+            } else {
+                BeansWrapper ow = env.getObjectWrapper();
+                List/*<TemplateModel>*/ tmArgs = new ArrayList(positionalParamValues.size());
+                for (int i = 0; i < positionalParamValues.size(); i++) {
+                    try {
+                        tmArgs.add(ow.wrap(positionalParamValues.get(i)));
+                    } catch (TemplateModelException e) {
+                        throw new _ObjectBuilderSettingEvaluationException("Failed to wrap arg #" + (i + 1), e);
+                    }
+                }
+                try {
+                    return ow.newInstance(cl, tmArgs);
+                } catch (Exception e) {
+                    throw new _ObjectBuilderSettingEvaluationException(
+                            "Failed to call " + cl.getName() + " constructor", e);
+                }
+            }
+        }
+
+        private Object callBuild(Object constructorResult)
+                throws _ObjectBuilderSettingEvaluationException {
+            final Class cl = constructorResult.getClass();
+            Method buildMethod; 
+            try {
+                buildMethod = constructorResult.getClass().getMethod(BUILD_METHOD_NAME, (Class[]) null);
+            } catch (NoSuchMethodException e) {
+                throw new _ObjectBuilderSettingEvaluationException("The " + cl.getName()
+                        + " builder class must have a public " + BUILD_METHOD_NAME + "() method", e);
+            } catch (Exception e) {
+                throw new _ObjectBuilderSettingEvaluationException("Failed to get the " + BUILD_METHOD_NAME
+                        + "() method of the " + cl.getName() + " builder class", e);
+            }
+            
+            try {
+                return buildMethod.invoke(constructorResult, (Object[]) null);
+            } catch (Exception e) {
+                Throwable cause;
+                if (e instanceof InvocationTargetException) {
+                    cause = ((InvocationTargetException) e).getTargetException();
+                } else {
+                    cause = e;
+                }
+                throw new _ObjectBuilderSettingEvaluationException("Failed to call " + BUILD_METHOD_NAME
+                        + "() method on " + cl.getName() + " instance", cause);
+            }
+        }
+
+        private boolean hasNoParameters() {
+            return positionalParamValues.isEmpty() && namedParamValues.isEmpty();
+        }
+
+        @Override
+        protected boolean getAllowPositionalParameters() {
+            return true;
+        }
+        
+    }
+    
+    private class PropertyAssignmentsExpression extends ExpressionWithParameters {
+        
+        private final Object bean;
+        
+        public PropertyAssignmentsExpression(Object bean) {
+            this.bean = bean;
+        }
+
+        @Override
+        Object eval() throws _ObjectBuilderSettingEvaluationException {
+            setJavaBeanProperties(bean, namedParamNames, namedParamValues);
+            return bean;
+        }
+
+        @Override
+        protected boolean getAllowPositionalParameters() {
+            return false;
+        }
+        
+    }
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/_ParserConfigurationWithInheritedFormat.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/_ParserConfigurationWithInheritedFormat.java b/src/main/java/org/apache/freemarker/core/_ParserConfigurationWithInheritedFormat.java
new file mode 100644
index 0000000..7935cdb
--- /dev/null
+++ b/src/main/java/org/apache/freemarker/core/_ParserConfigurationWithInheritedFormat.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.freemarker.core;
+
+/**
+ * For internal use only; don't depend on this, there's no backward compatibility guarantee at all!
+ */ 
+public final class _ParserConfigurationWithInheritedFormat implements ParserConfiguration {
+
+    private final OutputFormat outputFormat;
+    private final Integer autoEscapingPolicy;
+    private final ParserConfiguration wrappedPCfg;
+
+    public _ParserConfigurationWithInheritedFormat(ParserConfiguration wrappedPCfg, OutputFormat outputFormat,
+            Integer autoEscapingPolicy) {
+        this.outputFormat = outputFormat;
+        this.autoEscapingPolicy = autoEscapingPolicy;
+        this.wrappedPCfg = wrappedPCfg;
+    }
+
+    @Override
+    public boolean getWhitespaceStripping() {
+        return wrappedPCfg.getWhitespaceStripping();
+    }
+
+    @Override
+    public int getTagSyntax() {
+        return wrappedPCfg.getTagSyntax();
+    }
+
+    @Override
+    public OutputFormat getOutputFormat() {
+        return outputFormat != null ? outputFormat : wrappedPCfg.getOutputFormat();
+    }
+
+    @Override
+    public boolean getRecognizeStandardFileExtensions() {
+        return false;
+    }
+
+    @Override
+    public int getNamingConvention() {
+        return wrappedPCfg.getNamingConvention();
+    }
+
+    @Override
+    public Version getIncompatibleImprovements() {
+        return wrappedPCfg.getIncompatibleImprovements();
+    }
+
+    @Override
+    public int getAutoEscapingPolicy() {
+        return autoEscapingPolicy != null ? autoEscapingPolicy.intValue() : wrappedPCfg.getAutoEscapingPolicy();
+    }
+
+    @Override
+    public ArithmeticEngine getArithmeticEngine() {
+        return wrappedPCfg.getArithmeticEngine();
+    }
+
+    @Override
+    public int getTabSize() {
+        return wrappedPCfg.getTabSize();
+    }
+    
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/_SettingEvaluationEnvironment.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/_SettingEvaluationEnvironment.java b/src/main/java/org/apache/freemarker/core/_SettingEvaluationEnvironment.java
new file mode 100644
index 0000000..7e9fb37
--- /dev/null
+++ b/src/main/java/org/apache/freemarker/core/_SettingEvaluationEnvironment.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.freemarker.core;
+
+import java.util.Properties;
+
+import org.apache.freemarker.core.model.impl.beans.BeansWrapper;
+
+/**
+ * Don't use this; used internally by FreeMarker, might changes without notice.
+ * The runtime environment used during the evaluation of configuration {@link Properties}.
+ */
+public class _SettingEvaluationEnvironment {
+    
+    private static final ThreadLocal CURRENT = new ThreadLocal();
+
+    private BeansWrapper objectWrapper;
+    
+    public static _SettingEvaluationEnvironment getCurrent() {
+        Object r = CURRENT.get();
+        if (r != null) {
+            return (_SettingEvaluationEnvironment) r;
+        }
+        return new _SettingEvaluationEnvironment();
+    }
+    
+    public static _SettingEvaluationEnvironment startScope() {
+        Object previous = CURRENT.get();
+        CURRENT.set(new _SettingEvaluationEnvironment());
+        return (_SettingEvaluationEnvironment) previous;
+    }
+    
+    public static void endScope(_SettingEvaluationEnvironment previous) {
+        CURRENT.set(previous);
+    }
+
+    public BeansWrapper getObjectWrapper() {
+        if (objectWrapper == null) {
+            objectWrapper = new BeansWrapper(Configuration.VERSION_3_0_0);
+        }
+        return objectWrapper;
+    }
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/_TemplateAPI.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/_TemplateAPI.java b/src/main/java/org/apache/freemarker/core/_TemplateAPI.java
index 8eefbd6..05906da 100644
--- a/src/main/java/org/apache/freemarker/core/_TemplateAPI.java
+++ b/src/main/java/org/apache/freemarker/core/_TemplateAPI.java
@@ -21,9 +21,6 @@ package org.apache.freemarker.core;
 
 import java.util.Set;
 
-import org.apache.freemarker.core.ast.Expression;
-import org.apache.freemarker.core.ast.OutputFormat;
-import org.apache.freemarker.core.ast.TemplateObject;
 import org.apache.freemarker.core.templateresolver.CacheStorage;
 import org.apache.freemarker.core.util._NullArgumentException;
 
@@ -50,7 +47,7 @@ public class _TemplateAPI {
         }
     }
     
-    public static int getTemplateLanguageVersionAsInt(TemplateObject to) {
+    public static int getTemplateLanguageVersionAsInt(ASTNode to) {
         return getTemplateLanguageVersionAsInt(to.getTemplate());
     }
 
@@ -114,7 +111,7 @@ public class _TemplateAPI {
         }
     }
     
-    public static Expression getBlamedExpression(TemplateException e) {
+    public static ASTExpression getBlamedExpression(TemplateException e) {
         return e.getBlamedExpression();
     }
     

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/_TemplateModelException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/_TemplateModelException.java b/src/main/java/org/apache/freemarker/core/_TemplateModelException.java
new file mode 100644
index 0000000..8bf27bb
--- /dev/null
+++ b/src/main/java/org/apache/freemarker/core/_TemplateModelException.java
@@ -0,0 +1,133 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.freemarker.core;
+
+import org.apache.freemarker.core.model.TemplateModel;
+import org.apache.freemarker.core.model.TemplateModelException;
+import org.apache.freemarker.core.util._ClassUtil;
+
+public class _TemplateModelException extends TemplateModelException {
+
+    // Note: On Java 5 we will use `String descPart1, Object... furtherDescParts` instead of `Object[] descriptionParts`
+    //       and `String description`. That's why these are at the end of the parameter list.
+    
+    // -----------------------------------------------------------------------------------------------------------------
+    // Permutation group:
+    
+    public _TemplateModelException(String description) {
+        super(description);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Permutation group:
+
+    public _TemplateModelException(Throwable cause, String description) {
+        this(cause, null, description);
+    }
+
+    public _TemplateModelException(Environment env, String description) {
+        this((Throwable) null, env, description);
+    }
+    
+    public _TemplateModelException(Throwable cause, Environment env) {
+        this(cause, env, (String) null);
+    }
+
+    public _TemplateModelException(Throwable cause) {
+        this(cause, null, (String) null);
+    }
+    
+    public _TemplateModelException(Throwable cause, Environment env, String description) {
+        super(cause, env, description, true);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Permutation group:
+    
+    public _TemplateModelException(_ErrorDescriptionBuilder description) {
+        this(null, description);
+    }
+
+    public _TemplateModelException(Environment env, _ErrorDescriptionBuilder description) {
+        this(null, env, description);
+    }
+
+    public _TemplateModelException(Throwable cause, Environment env, _ErrorDescriptionBuilder description) {
+        super(cause, env, description, true);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Permutation group:
+    
+    public _TemplateModelException(Object... descriptionParts) {
+        this((Environment) null, descriptionParts);
+    }
+
+    public _TemplateModelException(Environment env, Object... descriptionParts) {
+        this((Throwable) null, env, descriptionParts);
+    }
+
+    public _TemplateModelException(Throwable cause, Object... descriptionParts) {
+        this(cause, null, descriptionParts);
+    }
+
+    public _TemplateModelException(Throwable cause, Environment env, Object... descriptionParts) {
+        super(cause, env, new _ErrorDescriptionBuilder(descriptionParts), true);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Permutation group:
+    
+    public _TemplateModelException(ASTExpression blamed, Object... descriptionParts) {
+        this(blamed, null, descriptionParts);
+    }
+
+    public _TemplateModelException(ASTExpression blamed, Environment env, Object... descriptionParts) {
+        this(blamed, null, env, descriptionParts);
+    }
+
+    public _TemplateModelException(ASTExpression blamed, Throwable cause, Environment env, Object... descriptionParts) {
+        super(cause, env, new _ErrorDescriptionBuilder(descriptionParts).blame(blamed), true);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Permutation group:
+    
+    public _TemplateModelException(ASTExpression blamed, String description) {
+        this(blamed, null, description);
+    }
+
+    public _TemplateModelException(ASTExpression blamed, Environment env, String description) {
+        this(blamed, null, env, description);
+    }
+
+    public _TemplateModelException(ASTExpression blamed, Throwable cause, Environment env, String description) {
+        super(cause, env, new _ErrorDescriptionBuilder(description).blame(blamed), true);
+    }
+
+    static Object[] modelHasStoredNullDescription(Class expected, TemplateModel model) {
+        return new Object[] {
+                "The FreeMarker value exists, but has nothing inside it; the TemplateModel object (class: ",
+                model.getClass().getName(), ") has returned a null",
+                (expected != null ? new Object[] { " instead of a ", _ClassUtil.getShortClassName(expected) } : ""),
+                ". This is possibly a bug in the non-FreeMarker code that builds the data-model." };
+    }
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/_TimeZoneBuilder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/_TimeZoneBuilder.java b/src/main/java/org/apache/freemarker/core/_TimeZoneBuilder.java
new file mode 100644
index 0000000..d533f85
--- /dev/null
+++ b/src/main/java/org/apache/freemarker/core/_TimeZoneBuilder.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.freemarker.core;
+
+import java.util.TimeZone;
+
+/**
+ * For internal use only; don't depend on this, there's no backward compatibility guarantee at all!
+ */
+public class _TimeZoneBuilder {
+
+    private final String timeZoneId;
+
+    public _TimeZoneBuilder(String timeZoneId) {
+        this.timeZoneId = timeZoneId;
+    }
+
+    public TimeZone build() {
+        TimeZone timeZone = TimeZone.getTimeZone(timeZoneId);
+        if (timeZone.getID().equals("GMT") && !timeZoneId.equals("GMT") && !timeZoneId.equals("UTC")
+                && !timeZoneId.equals("GMT+00") && !timeZoneId.equals("GMT+00:00") && !timeZoneId.equals("GMT+0000")) {
+            throw new IllegalArgumentException("Unrecognized time zone: " + timeZoneId);
+        }
+        return timeZone;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java b/src/main/java/org/apache/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java
new file mode 100644
index 0000000..0b98ff6
--- /dev/null
+++ b/src/main/java/org/apache/freemarker/core/_UnexpectedTypeErrorExplainerTemplateModel.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.freemarker.core;
+
+import org.apache.freemarker.core.model.TemplateModel;
+
+/**
+ * Don't use this; used internally by FreeMarker, might changes without notice.
+ * 
+ * <p>Implemented by {@link TemplateModel}-s that can explain why they don't implement a certain type. 
+ * */
+public interface _UnexpectedTypeErrorExplainerTemplateModel extends TemplateModel {
+
+    /**
+     * @return A single {@link _ErrorDescriptionBuilder} tip, or {@code null}.
+     */
+    Object[] explainTypeError(Class[]/*<? extends TemplateModel>*/ expectedClasses);
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/ast/APINotSupportedTemplateException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/APINotSupportedTemplateException.java b/src/main/java/org/apache/freemarker/core/ast/APINotSupportedTemplateException.java
deleted file mode 100644
index e232839..0000000
--- a/src/main/java/org/apache/freemarker/core/ast/APINotSupportedTemplateException.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.freemarker.core.ast;
-
-import org.apache.freemarker.core.TemplateException;
-import org.apache.freemarker.core.model.ObjectWrapper;
-import org.apache.freemarker.core.model.TemplateModel;
-import org.apache.freemarker.core.model.impl.DefaultObjectWrapper;
-import org.apache.freemarker.core.model.impl.SimpleHash;
-import org.apache.freemarker.core.model.impl.SimpleSequence;
-
-/**
- * Thrown when {@code ?api} is not supported by a value.
- */
-class APINotSupportedTemplateException extends TemplateException {
-
-    APINotSupportedTemplateException(Environment env, Expression blamedExpr, TemplateModel model) {
-        super(null, env, blamedExpr, buildDescription(env, blamedExpr, model));
-    }
-
-    protected static _ErrorDescriptionBuilder buildDescription(Environment env, Expression blamedExpr,
-            TemplateModel tm) {
-        final _ErrorDescriptionBuilder desc = new _ErrorDescriptionBuilder(
-                "The value doesn't support ?api. See requirements in the FreeMarker Manual. ("
-                + "FTL type: ", new _DelayedFTLTypeDescription(tm),
-                ", TemplateModel class: ", new _DelayedShortClassName(tm.getClass()),
-                ", ObjectWapper: ", new _DelayedToString(env.getObjectWrapper()), ")"
-        ).blame(blamedExpr);
-
-        if (blamedExpr.isLiteral()) {
-            desc.tip("Only adapted Java objects can possibly have API, not values created inside templates.");
-        } else {
-            ObjectWrapper ow = env.getObjectWrapper();
-            if (ow instanceof DefaultObjectWrapper
-                    && (tm instanceof SimpleHash || tm instanceof SimpleSequence)) {
-                DefaultObjectWrapper dow = (DefaultObjectWrapper) ow;
-                if (!dow.getUseAdaptersForContainers()) {
-                    desc.tip("In the FreeMarker configuration, \"", Configurable.OBJECT_WRAPPER_KEY,
-                            "\" is a DefaultObjectWrapper with its \"useAdaptersForContainers\" property set to "
-                            + "false. Setting it to true might solves this problem.");
-                } else if (tm instanceof SimpleSequence && dow.getForceLegacyNonListCollections()) {
-                    desc.tip("In the FreeMarker configuration, \"",
-                            Configurable.OBJECT_WRAPPER_KEY,
-                            "\" is a DefaultObjectWrapper with its \"forceLegacyNonListCollections\" property set "
-                            + "to true. If you are trying to access the API of a non-List Collection, setting the "
-                            + "\"forceLegacyNonListCollections\" property to false might solves this problem.");
-                }
-            }
-        }
-
-        return desc;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java b/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java
deleted file mode 100644
index fc48738..0000000
--- a/src/main/java/org/apache/freemarker/core/ast/AddConcatExpression.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.freemarker.core.ast;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.freemarker.core.TemplateException;
-import org.apache.freemarker.core.model.TemplateCollectionModel;
-import org.apache.freemarker.core.model.TemplateHashModel;
-import org.apache.freemarker.core.model.TemplateHashModelEx;
-import org.apache.freemarker.core.model.TemplateModel;
-import org.apache.freemarker.core.model.TemplateModelException;
-import org.apache.freemarker.core.model.TemplateModelIterator;
-import org.apache.freemarker.core.model.TemplateNumberModel;
-import org.apache.freemarker.core.model.TemplateScalarModel;
-import org.apache.freemarker.core.model.TemplateSequenceModel;
-import org.apache.freemarker.core.model.impl.SimpleNumber;
-import org.apache.freemarker.core.model.impl.SimpleScalar;
-import org.apache.freemarker.core.model.impl.SimpleSequence;
-
-/**
- * An operator for the + operator. Note that this is treated
- * separately from the other 4 arithmetic operators,
- * since + is overloaded to mean string concatenation.
- */
-final class AddConcatExpression extends Expression {
-
-    private final Expression left;
-    private final Expression right;
-
-    AddConcatExpression(Expression left, Expression right) {
-        this.left = left;
-        this.right = right;
-    }
-
-    @Override
-    TemplateModel _eval(Environment env) throws TemplateException {
-        return _eval(env, this, left, left.eval(env), right, right.eval(env));
-    }
-
-    /**
-     * @param leftExp
-     *            Used for error messages only; can be {@code null}
-     * @param rightExp
-     *            Used for error messages only; can be {@code null}
-     */
-    static TemplateModel _eval(Environment env,
-            TemplateObject parent,
-            Expression leftExp, TemplateModel leftModel,
-            Expression rightExp, TemplateModel rightModel)
-            throws TemplateModelException, TemplateException, NonStringException {
-        if (leftModel instanceof TemplateNumberModel && rightModel instanceof TemplateNumberModel) {
-            Number first = EvalUtil.modelToNumber((TemplateNumberModel) leftModel, leftExp);
-            Number second = EvalUtil.modelToNumber((TemplateNumberModel) rightModel, rightExp);
-            return _evalOnNumbers(env, parent, first, second);
-        } else if (leftModel instanceof TemplateSequenceModel && rightModel instanceof TemplateSequenceModel) {
-            return new ConcatenatedSequence((TemplateSequenceModel) leftModel, (TemplateSequenceModel) rightModel);
-        } else {
-            boolean hashConcatPossible
-                    = leftModel instanceof TemplateHashModel && rightModel instanceof TemplateHashModel;
-            try {
-                // We try string addition first. If hash addition is possible, then instead of throwing exception
-                // we return null and do hash addition instead. (We can't simply give hash addition a priority, like
-                // with sequence addition above, as FTL strings are often also FTL hashes.)
-                Object leftOMOrStr = EvalUtil.coerceModelToStringOrMarkup(
-                        leftModel, leftExp, /* returnNullOnNonCoercableType = */ hashConcatPossible, null,
-                        env);
-                if (leftOMOrStr == null) {
-                    return _eval_concatenateHashes(leftModel, rightModel);
-                }
-
-                // Same trick with null return as above.
-                Object rightOMOrStr = EvalUtil.coerceModelToStringOrMarkup(
-                        rightModel, rightExp, /* returnNullOnNonCoercableType = */ hashConcatPossible, null,
-                        env);
-                if (rightOMOrStr == null) {
-                    return _eval_concatenateHashes(leftModel, rightModel);
-                }
-
-                if (leftOMOrStr instanceof String) {
-                    if (rightOMOrStr instanceof String) {
-                        return new SimpleScalar(((String) leftOMOrStr).concat((String) rightOMOrStr));
-                    } else { // rightOMOrStr instanceof TemplateMarkupOutputModel
-                        TemplateMarkupOutputModel<?> rightMO = (TemplateMarkupOutputModel<?>) rightOMOrStr; 
-                        return EvalUtil.concatMarkupOutputs(parent,
-                                rightMO.getOutputFormat().fromPlainTextByEscaping((String) leftOMOrStr),
-                                rightMO);
-                    }                    
-                } else { // leftOMOrStr instanceof TemplateMarkupOutputModel 
-                    TemplateMarkupOutputModel<?> leftMO = (TemplateMarkupOutputModel<?>) leftOMOrStr; 
-                    if (rightOMOrStr instanceof String) {  // markup output
-                        return EvalUtil.concatMarkupOutputs(parent,
-                                leftMO,
-                                leftMO.getOutputFormat().fromPlainTextByEscaping((String) rightOMOrStr));
-                    } else { // rightOMOrStr instanceof TemplateMarkupOutputModel
-                        return EvalUtil.concatMarkupOutputs(parent,
-                                leftMO,
-                                (TemplateMarkupOutputModel<?>) rightOMOrStr);
-                    }
-                }
-            } catch (NonStringOrTemplateOutputException e) {
-                // 2.4: Remove this catch; it's for BC, after reworking hash addition so it doesn't rely on this. But
-                // user code might throws this (very unlikely), and then in 2.3.x we did catch that too, incorrectly.
-                if (hashConcatPossible) {
-                    return _eval_concatenateHashes(leftModel, rightModel);
-                } else {
-                    throw e;
-                }
-            }
-        }
-    }
-
-    private static TemplateModel _eval_concatenateHashes(TemplateModel leftModel, TemplateModel rightModel)
-            throws TemplateModelException {
-        if (leftModel instanceof TemplateHashModelEx && rightModel instanceof TemplateHashModelEx) {
-            TemplateHashModelEx leftModelEx = (TemplateHashModelEx) leftModel;
-            TemplateHashModelEx rightModelEx = (TemplateHashModelEx) rightModel;
-            if (leftModelEx.size() == 0) {
-                return rightModelEx;
-            } else if (rightModelEx.size() == 0) {
-                return leftModelEx;
-            } else {
-                return new ConcatenatedHashEx(leftModelEx, rightModelEx);
-            }
-        } else {
-            return new ConcatenatedHash((TemplateHashModel) leftModel,
-                                        (TemplateHashModel) rightModel);
-        }
-    }
-
-    static TemplateModel _evalOnNumbers(Environment env, TemplateObject parent, Number first, Number second)
-            throws TemplateException {
-        ArithmeticEngine ae = EvalUtil.getArithmeticEngine(env, parent);
-        return new SimpleNumber(ae.add(first, second));
-    }
-
-    @Override
-    boolean isLiteral() {
-        return constantValue != null || (left.isLiteral() && right.isLiteral());
-    }
-
-    @Override
-    protected Expression deepCloneWithIdentifierReplaced_inner(
-            String replacedIdentifier, Expression replacement, ReplacemenetState replacementState) {
-    	return new AddConcatExpression(
-    	left.deepCloneWithIdentifierReplaced(replacedIdentifier, replacement, replacementState),
-    	right.deepCloneWithIdentifierReplaced(replacedIdentifier, replacement, replacementState));
-    }
-
-    @Override
-    public String getCanonicalForm() {
-        return left.getCanonicalForm() + " + " + right.getCanonicalForm();
-    }
-    
-    @Override
-    String getNodeTypeSymbol() {
-        return "+";
-    }
-    
-    @Override
-    int getParameterCount() {
-        return 2;
-    }
-
-    @Override
-    Object getParameterValue(int idx) {
-        return idx == 0 ? left : right;
-    }
-
-    @Override
-    ParameterRole getParameterRole(int idx) {
-        return ParameterRole.forBinaryOperatorOperand(idx);
-    }
-
-    private static final class ConcatenatedSequence
-    implements
-        TemplateSequenceModel {
-        private final TemplateSequenceModel left;
-        private final TemplateSequenceModel right;
-
-        ConcatenatedSequence(TemplateSequenceModel left, TemplateSequenceModel right) {
-            this.left = left;
-            this.right = right;
-        }
-
-        @Override
-        public int size()
-        throws TemplateModelException {
-            return left.size() + right.size();
-        }
-
-        @Override
-        public TemplateModel get(int i)
-        throws TemplateModelException {
-            int ls = left.size();
-            return i < ls ? left.get(i) : right.get(i - ls);
-        }
-    }
-
-    private static class ConcatenatedHash
-    implements TemplateHashModel {
-        protected final TemplateHashModel left;
-        protected final TemplateHashModel right;
-
-        ConcatenatedHash(TemplateHashModel left, TemplateHashModel right) {
-            this.left = left;
-            this.right = right;
-        }
-        
-        @Override
-        public TemplateModel get(String key)
-        throws TemplateModelException {
-            TemplateModel model = right.get(key);
-            return (model != null) ? model : left.get(key);
-        }
-
-        @Override
-        public boolean isEmpty()
-        throws TemplateModelException {
-            return left.isEmpty() && right.isEmpty();
-        }
-    }
-
-    private static final class ConcatenatedHashEx
-    extends ConcatenatedHash
-    implements TemplateHashModelEx {
-        private CollectionAndSequence keys;
-        private CollectionAndSequence values;
-        private int size;
-
-        ConcatenatedHashEx(TemplateHashModelEx left, TemplateHashModelEx right) {
-            super(left, right);
-        }
-        
-        @Override
-        public int size() throws TemplateModelException {
-            initKeys();
-            return size;
-        }
-
-        @Override
-        public TemplateCollectionModel keys()
-        throws TemplateModelException {
-            initKeys();
-            return keys;
-        }
-
-        @Override
-        public TemplateCollectionModel values()
-        throws TemplateModelException {
-            initValues();
-            return values;
-        }
-
-        private void initKeys()
-        throws TemplateModelException {
-            if (keys == null) {
-                HashSet keySet = new HashSet();
-                SimpleSequence keySeq = new SimpleSequence(32);
-                addKeys(keySet, keySeq, (TemplateHashModelEx) left);
-                addKeys(keySet, keySeq, (TemplateHashModelEx) right);
-                size = keySet.size();
-                keys = new CollectionAndSequence(keySeq);
-            }
-        }
-
-        private static void addKeys(Set set, SimpleSequence keySeq, TemplateHashModelEx hash)
-        throws TemplateModelException {
-            TemplateModelIterator it = hash.keys().iterator();
-            while (it.hasNext()) {
-                TemplateScalarModel tsm = (TemplateScalarModel) it.next();
-                if (set.add(tsm.getAsString())) {
-                    // The first occurence of the key decides the index;
-                    // this is consisten with stuff like java.util.LinkedHashSet.
-                    keySeq.add(tsm);
-                }
-            }
-        }        
-
-        private void initValues()
-        throws TemplateModelException {
-            if (values == null) {
-                SimpleSequence seq = new SimpleSequence(size());
-                // Note: size() invokes initKeys() if needed.
-            
-                int ln = keys.size();
-                for (int i  = 0; i < ln; i++) {
-                    seq.add(get(((TemplateScalarModel) keys.get(i)).getAsString()));
-                }
-                values = new CollectionAndSequence(seq);
-            }
-        }
-    }
-    
-}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/ast/AliasTargetTemplateValueFormatException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/AliasTargetTemplateValueFormatException.java b/src/main/java/org/apache/freemarker/core/ast/AliasTargetTemplateValueFormatException.java
deleted file mode 100644
index 0a4bd02..0000000
--- a/src/main/java/org/apache/freemarker/core/ast/AliasTargetTemplateValueFormatException.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.freemarker.core.ast;
-
-/**
- * Can't create a template format that the template format refers to (typically thrown by alias template formats).
- * 
- * @since 2.3.24
- */
-class AliasTargetTemplateValueFormatException extends TemplateValueFormatException {
-
-    public AliasTargetTemplateValueFormatException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public AliasTargetTemplateValueFormatException(String message) {
-        super(message);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/ast/AliasTemplateDateFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/AliasTemplateDateFormatFactory.java b/src/main/java/org/apache/freemarker/core/ast/AliasTemplateDateFormatFactory.java
deleted file mode 100644
index 014c221..0000000
--- a/src/main/java/org/apache/freemarker/core/ast/AliasTemplateDateFormatFactory.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.freemarker.core.ast;
-
-import java.util.Locale;
-import java.util.Map;
-import java.util.TimeZone;
-
-import org.apache.freemarker.core.util._StringUtil;
-import org.apache.freemarker.core.util._LocaleUtil;
-
-/**
- * Creates an alias to another format, so that the format can be referred to with a simple name in the template, rather
- * than as a concrete pattern or other kind of format string.
- * 
- * @since 2.3.24
- */
-public final class AliasTemplateDateFormatFactory extends TemplateDateFormatFactory {
-
-    private final String defaultTargetFormatString;
-    private final Map<Locale, String> localizedTargetFormatStrings;
-
-    /**
-     * @param targetFormatString
-     *            The format string this format will be an alias to.
-     */
-    public AliasTemplateDateFormatFactory(String targetFormatString) {
-        defaultTargetFormatString = targetFormatString;
-        localizedTargetFormatStrings = null;
-    }
-
-    /**
-     * @param defaultTargetFormatString
-     *            The format string this format will be an alias to if there's no locale-specific format string for the
-     *            requested locale in {@code localizedTargetFormatStrings}
-     * @param localizedTargetFormatStrings
-     *            Maps {@link Locale}-s to format strings. If the desired locale doesn't occur in the map, a less
-     *            specific locale is tried, repeatedly until only the language part remains. For example, if locale is
-     *            {@code new Locale("en", "US", "Linux")}, then these keys will be attempted untol a match is found, in
-     *            this order: {@code new Locale("en", "US", "Linux")}, {@code new Locale("en", "US")},
-     *            {@code new Locale("en")}. If there's still no matching key, the value of the
-     *            {@code targetFormatString} will be used.
-     */
-    public AliasTemplateDateFormatFactory(
-            String defaultTargetFormatString, Map<Locale, String> localizedTargetFormatStrings) {
-        this.defaultTargetFormatString = defaultTargetFormatString;
-        this.localizedTargetFormatStrings = localizedTargetFormatStrings;
-    }
-    
-    @Override
-    public TemplateDateFormat get(String params, int dateType, Locale locale, TimeZone timeZone, boolean zonelessInput,
-            Environment env) throws TemplateValueFormatException {
-        TemplateFormatUtil.checkHasNoParameters(params);
-        try {
-            String targetFormatString;
-            if (localizedTargetFormatStrings != null) {
-                Locale lookupLocale = locale;
-                targetFormatString = localizedTargetFormatStrings.get(lookupLocale);
-                while (targetFormatString == null
-                        && (lookupLocale = _LocaleUtil.getLessSpecificLocale(lookupLocale)) != null) {
-                    targetFormatString = localizedTargetFormatStrings.get(lookupLocale);
-                }
-            } else {
-                targetFormatString = null;
-            }
-            if (targetFormatString == null) {
-                targetFormatString = defaultTargetFormatString;
-            }
-            return env.getTemplateDateFormat(targetFormatString, dateType, locale, timeZone, zonelessInput);
-        } catch (TemplateValueFormatException e) {
-            throw new AliasTargetTemplateValueFormatException("Failed to create format based on target format string,  "
-                    + _StringUtil.jQuote(params) + ". Reason given: " + e.getMessage(), e);
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/7d784b2b/src/main/java/org/apache/freemarker/core/ast/AliasTemplateNumberFormatFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/ast/AliasTemplateNumberFormatFactory.java b/src/main/java/org/apache/freemarker/core/ast/AliasTemplateNumberFormatFactory.java
deleted file mode 100644
index 2fab315..0000000
--- a/src/main/java/org/apache/freemarker/core/ast/AliasTemplateNumberFormatFactory.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.freemarker.core.ast;
-
-import java.util.Locale;
-import java.util.Map;
-
-import org.apache.freemarker.core.util._StringUtil;
-import org.apache.freemarker.core.util._LocaleUtil;
-
-/**
- * Creates an alias to another format, so that the format can be referred to with a simple name in the template, rather
- * than as a concrete pattern or other kind of format string.
- * 
- * @since 2.3.24
- */
-public final class AliasTemplateNumberFormatFactory extends TemplateNumberFormatFactory {
-
-    private final String defaultTargetFormatString;
-    private final Map<Locale, String> localizedTargetFormatStrings;
-
-    /**
-     * @param targetFormatString
-     *            The format string this format will be an alias to
-     */
-    public AliasTemplateNumberFormatFactory(String targetFormatString) {
-        defaultTargetFormatString = targetFormatString;
-        localizedTargetFormatStrings = null;
-    }
-
-    /**
-     * @param defaultTargetFormatString
-     *            The format string this format will be an alias to if there's no locale-specific format string for the
-     *            requested locale in {@code localizedTargetFormatStrings}
-     * @param localizedTargetFormatStrings
-     *            Maps {@link Locale}-s to format strings. If the desired locale doesn't occur in the map, a less
-     *            specific locale is tried, repeatedly until only the language part remains. For example, if locale is
-     *            {@code new Locale("en", "US", "Linux")}, then these keys will be attempted untol a match is found, in
-     *            this order: {@code new Locale("en", "US", "Linux")}, {@code new Locale("en", "US")},
-     *            {@code new Locale("en")}. If there's still no matching key, the value of the
-     *            {@code targetFormatString} will be used.
-     */
-    public AliasTemplateNumberFormatFactory(
-            String defaultTargetFormatString, Map<Locale, String> localizedTargetFormatStrings) {
-        this.defaultTargetFormatString = defaultTargetFormatString;
-        this.localizedTargetFormatStrings = localizedTargetFormatStrings;
-    }
-
-    @Override
-    public TemplateNumberFormat get(String params, Locale locale, Environment env)
-            throws TemplateValueFormatException {
-        TemplateFormatUtil.checkHasNoParameters(params);
-        try {
-            String targetFormatString;
-            if (localizedTargetFormatStrings != null) {
-                Locale lookupLocale = locale;
-                targetFormatString = localizedTargetFormatStrings.get(lookupLocale);
-                while (targetFormatString == null
-                        && (lookupLocale = _LocaleUtil.getLessSpecificLocale(lookupLocale)) != null) {
-                    targetFormatString = localizedTargetFormatStrings.get(lookupLocale);
-                }
-            } else {
-                targetFormatString = null;
-            }
-            if (targetFormatString == null) {
-                targetFormatString = defaultTargetFormatString;
-            }
-            return env.getTemplateNumberFormat(targetFormatString, locale);
-        } catch (TemplateValueFormatException e) {
-            throw new AliasTargetTemplateValueFormatException("Failed to create format based on target format string,  "
-                    + _StringUtil.jQuote(params) + ". Reason given: " + e.getMessage(), e);
-        }
-    }
-
-}



Mime
View raw message