Mercurial Hosting > luan

changeset 56:c84274b18f0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
various git-svn-id: https://luan-java.googlecode.com/svn/trunk@57 21e917c8-12df-6dd8-5cb6-c86387c605b9
author fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
date Fri, 04 Jan 2013 21:35:55 +0000
parents 9381b23ea9e1
children 19ca9c4c6c7f
files src/luan/LuanJavaFunction.java src/luan/interp/FnCall.java src/luan/interp/IndexExpr.java src/luan/interp/LuanParser.java src/luan/lib/JavaLib.java
diffstat 5 files changed, 62 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
diff -r 9381b23ea9e1 -r c84274b18f0c src/luan/LuanJavaFunction.java
--- a/src/luan/LuanJavaFunction.java	Fri Jan 04 04:50:18 2013 +0000
+++ b/src/luan/LuanJavaFunction.java	Fri Jan 04 21:35:55 2013 +0000
@@ -65,7 +65,7 @@
 			if( cause instanceof Error )
 				throw (Error)cause;
 			if( cause instanceof RuntimeException )
-				throw (RuntimeException)cause;
+				throw new LuanException(luan,LuanElement.JAVA,cause);
 			if( cause instanceof LuanException )
 				throw (LuanException)cause;
 			throw new RuntimeException(e);
diff -r 9381b23ea9e1 -r c84274b18f0c src/luan/interp/FnCall.java
--- a/src/luan/interp/FnCall.java	Fri Jan 04 04:50:18 2013 +0000
+++ b/src/luan/interp/FnCall.java	Fri Jan 04 21:35:55 2013 +0000
@@ -30,6 +30,6 @@
 		Object h = luan.getHandler("__call",o);
 		if( h != null )
 			return call(luan,h);
-		throw new LuanException( luan, se, "attempt to call a " + Luan.type(o) + " value" );
+		throw new LuanException( luan, fnExpr.se(), "attempt to call '"+fnExpr.se().text()+"' (a " + Luan.type(o) + " value)" );
 	}
 }
diff -r 9381b23ea9e1 -r c84274b18f0c src/luan/interp/IndexExpr.java
--- a/src/luan/interp/IndexExpr.java	Fri Jan 04 04:50:18 2013 +0000
+++ b/src/luan/interp/IndexExpr.java	Fri Jan 04 21:35:55 2013 +0000
@@ -30,7 +30,7 @@
 		} else {
 			h = luan.getHandler("__index",t);
 			if( h==null )
-				throw new LuanException( luan, se, "attempt to index a " + Luan.type(t) + " value" );
+				throw new LuanException( luan, op1.se(), "attempt to index '"+op1.se().text()+"' (a " + Luan.type(t) + " value)" );
 		}
 		if( h instanceof LuanFunction ) {
 			LuanFunction fn = (LuanFunction)h;
diff -r 9381b23ea9e1 -r c84274b18f0c src/luan/interp/LuanParser.java
--- a/src/luan/interp/LuanParser.java	Fri Jan 04 04:50:18 2013 +0000
+++ b/src/luan/interp/LuanParser.java	Fri Jan 04 21:35:55 2013 +0000
@@ -1092,7 +1092,8 @@
 			FirstOf(
 				AnyOf(" \t"),
 				Comment(),
-				Sequence( '\\', EndOfLine() )
+				Sequence( '\\', EndOfLine() ),
+				Sequence( AnyOf("\r\n"), parens > 0 )
 			)
 		);
 	}
diff -r 9381b23ea9e1 -r c84274b18f0c src/luan/lib/JavaLib.java
--- a/src/luan/lib/JavaLib.java	Fri Jan 04 04:50:18 2013 +0000
+++ b/src/luan/lib/JavaLib.java	Fri Jan 04 21:35:55 2013 +0000
@@ -81,13 +81,13 @@
 						}
 					}
 				} else {
-					List<AccessibleObject> members = getStaticMembers(cls,name);
+					List<Member> members = getStaticMembers(cls,name);
 					if( !members.isEmpty() ) {
 						return member(null,members);
 					}
 				}
 			}
-			throw new LuanException(luan,LuanElement.JAVA,"invalid index for java class: "+key);
+			throw new LuanException(luan,LuanElement.JAVA,"invalid member '"+key+"' for: "+obj);
 		}
 		Class cls = obj.getClass();
 		if( cls.isArray() ) {
@@ -98,30 +98,33 @@
 			if( i != null ) {
 				return Array.get(obj,i);
 			}
-			throw new LuanException(luan,LuanElement.JAVA,"invalid index for java array: "+key);
+			throw new LuanException(luan,LuanElement.JAVA,"invalid member '"+key+"' for java array: "+obj);
 		}
 		if( key instanceof String ) {
 			String name = (String)key;
 			if( "instanceof".equals(name) ) {
 				return new LuanJavaFunction(instanceOf,new InstanceOf(obj));
 			} else {
-				List<AccessibleObject> members = getMembers(cls,name);
+				List<Member> members = getMembers(cls,name);
 				if( !members.isEmpty() ) {
 					return member(obj,members);
 				}
 			}
 		}
-		throw new LuanException(luan,LuanElement.JAVA,"invalid member for java object: "+key);
+		throw new LuanException(luan,LuanElement.JAVA,"invalid member '"+key+"' for java object: "+obj);
 	}
 
-	private static Object member(Object obj,List<AccessibleObject> members) throws LuanException {
+	private static Object member(Object obj,List<Member> members) throws LuanException {
 		try {
-			for( AccessibleObject m : members ) {
-				m.setAccessible(true);
+			for( Member m : members ) {
+				if( m instanceof AccessibleObject )
+					((AccessibleObject)m).setAccessible(true);
 			}
 			if( members.size()==1 ) {
-				AccessibleObject member = members.get(0);
-				if( member instanceof Field ) {
+				Member member = members.get(0);
+				if( member instanceof Static ) {
+					return member;
+				} else if( member instanceof Field ) {
 					Field field = (Field)member;
 					return field.get(obj);
 				} else {
@@ -130,7 +133,7 @@
 				}
 			} else {
 				List<LuanJavaFunction> fns = new ArrayList<LuanJavaFunction>();
-				for( AccessibleObject member : members ) {
+				for( Member member : members ) {
 					Method method = (Method)member;
 					fns.add(new LuanJavaFunction(method,obj));
 				}
@@ -141,53 +144,82 @@
 		}
 	}
 
-	private static Map<Class,Map<String,List<AccessibleObject>>> memberMap = new HashMap<Class,Map<String,List<AccessibleObject>>>();
+	private static Map<Class,Map<String,List<Member>>> memberMap = new HashMap<Class,Map<String,List<Member>>>();
 
-	private static synchronized List<AccessibleObject> getMembers(Class cls,String name) {
-		Map<String,List<AccessibleObject>> clsMap = memberMap.get(cls);
+	private static synchronized List<Member> getMembers(Class cls,String name) {
+		Map<String,List<Member>> clsMap = memberMap.get(cls);
 		if( clsMap == null ) {
-			clsMap = new HashMap<String,List<AccessibleObject>>();
+			clsMap = new HashMap<String,List<Member>>();
+			for( Class c : cls.getClasses() ) {
+				String s = c.getSimpleName();
+				List<Member> list = clsMap.get(s);
+				if( list == null ) {
+					list = new ArrayList<Member>();
+					clsMap.put(s,list);
+				}
+				list.add(new Static(c));
+			}
 			for( Field field : cls.getFields() ) {
 				String s = field.getName();
-				List<AccessibleObject> list = clsMap.get(s);
+				List<Member> list = clsMap.get(s);
 				if( list == null ) {
-					list = new ArrayList<AccessibleObject>();
+					list = new ArrayList<Member>();
 					clsMap.put(s,list);
 				}
 				list.add(field);
 			}
 			for( Method method : cls.getMethods() ) {
 				String s = method.getName();
-				List<AccessibleObject> list = clsMap.get(s);
+				List<Member> list = clsMap.get(s);
 				if( list == null ) {
-					list = new ArrayList<AccessibleObject>();
+					list = new ArrayList<Member>();
 					clsMap.put(s,list);
 				}
 				list.add(method);
 			}
 			memberMap.put(cls,clsMap);
 		}
-		List<AccessibleObject> rtn = clsMap.get(name);
+		List<Member> rtn = clsMap.get(name);
 		if( rtn==null )
 			rtn = Collections.emptyList();
 		return rtn;
 	}
 
-	private static synchronized List<AccessibleObject> getStaticMembers(Class cls,String name) {
-		List<AccessibleObject> staticMembers = new ArrayList<AccessibleObject>();
-		for( AccessibleObject m : getMembers(cls,name) ) {
-			if( Modifier.isStatic(((Member)m).getModifiers()) )
+	private static synchronized List<Member> getStaticMembers(Class cls,String name) {
+		List<Member> staticMembers = new ArrayList<Member>();
+		for( Member m : getMembers(cls,name) ) {
+			if( Modifier.isStatic(m.getModifiers()) )
 				staticMembers.add(m);
 		}
 		return staticMembers;
 	}
 
-	static class Static {
+	static final class Static implements Member {
 		final Class cls;
 
 		Static(Class cls) {
 			this.cls = cls;
 		}
+
+		@Override public String toString() {
+			return cls.toString();
+		}
+
+		@Override public Class<?> getDeclaringClass() {
+			return cls.getDeclaringClass();
+		}
+
+		@Override public String getName() {
+			return cls.getName();
+		}
+
+		@Override public int getModifiers() {
+			return cls.getModifiers();
+		}
+
+		@Override public boolean isSynthetic() {
+			return cls.isSynthetic();
+		}
 	}
 
 	public static Static getClass(LuanState luan,String name) throws LuanException {