Anonymous avatar Anonymous committed d9db6ea Draft

Slightly better names for Python functions. When they are a legal Java
identifier, include the actual names of the function, followed by
, where n is the unique integer previously used. This makes the names
understandable in a Java traceback while avoiding any need to worry about
name conflicts.

Comments (0)

Files changed (1)

org/python/compiler/Module.java

 		                        }
 		                        
 	Vector codes;
+	private boolean isJavaIdentifier(String s) {
+	    char[] chars = s.toCharArray();
+	    if (chars.length == 0) return false;
+	    if (!Character.isJavaIdentifierStart(chars[0])) return false;
+	    
+	    for(int i=1; i<chars.length; i++) {
+	        if (!Character.isJavaIdentifierPart(chars[i])) return false;
+	    }
+	    return true;
+	}
+	
 	public PyCodeConstant PyCode(SimpleNode tree, String name,
 								ArgListCompiler ac,
 								boolean fast_locals, boolean class_body,
 		code.id = codes.size();
 
 		//Better names in the future?
-		code.fname = "f"+code.id;
+		if (isJavaIdentifier(name)) code.fname = name+"$"+code.id;
+		else code.fname = "f$"+code.id;
 
 		codes.addElement(code);
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.