changeset 245:2ed8465a9d62

allow TemplateExpressions at end of table constructor git-svn-id: https://luan-java.googlecode.com/svn/trunk@246 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Thu, 09 Oct 2014 23:05:01 +0000
parents 0a8e6fdb62f0
children 58752e3e4c5c
files core/src/luan/impl/LuanParser.java dist/jars/luan-core-trunk.jar dist/jars/luan-logging-trunk.jar dist/jars/luan-lucene-trunk.jar dist/jars/luan-mail-trunk.jar dist/jars/luan-web-trunk.jar
diffstat 6 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
diff -r 0a8e6fdb62f0 -r 2ed8465a9d62 core/src/luan/impl/LuanParser.java
--- a/core/src/luan/impl/LuanParser.java	Thu Oct 09 22:44:07 2014 +0000
+++ b/core/src/luan/impl/LuanParser.java	Thu Oct 09 23:05:01 2014 +0000
@@ -834,6 +834,9 @@
 		List<TableExpr.Field> fields = new ArrayList<TableExpr.Field>();
 		List<Expressions> builder = new ArrayList<Expressions>();
 		while( Field(fields,builder,inParens) && FieldSep(inParens) );
+		Expressions exp = TemplateExpressions(in);
+		if( exp != null )
+			builder.add(exp);
 		if( !parser.match('}') )
 			throw parser.exception("Expected table element or '}'");
 		Spaces(in);
diff -r 0a8e6fdb62f0 -r 2ed8465a9d62 dist/jars/luan-core-trunk.jar
Binary file dist/jars/luan-core-trunk.jar has changed
diff -r 0a8e6fdb62f0 -r 2ed8465a9d62 dist/jars/luan-logging-trunk.jar
Binary file dist/jars/luan-logging-trunk.jar has changed
diff -r 0a8e6fdb62f0 -r 2ed8465a9d62 dist/jars/luan-lucene-trunk.jar
Binary file dist/jars/luan-lucene-trunk.jar has changed
diff -r 0a8e6fdb62f0 -r 2ed8465a9d62 dist/jars/luan-mail-trunk.jar
Binary file dist/jars/luan-mail-trunk.jar has changed
diff -r 0a8e6fdb62f0 -r 2ed8465a9d62 dist/jars/luan-web-trunk.jar
Binary file dist/jars/luan-web-trunk.jar has changed