SyntaxErrorBuiltins: initialize internal attributes array using SyntaxError factory

Author: cosminbasca

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -27,6 +27,7 @@
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.IndentationError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.TabError;
+import static com.oracle.graal.python.builtins.objects.exception.SyntaxErrorBuiltins.SYNTAX_ERROR_ATTR_FACTORY;
 import static com.oracle.graal.python.nodes.BuiltinNames.MODULES;
 import static com.oracle.graal.python.nodes.BuiltinNames.PRINT;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__PACKAGE__;
@@ -1095,10 +1096,13 @@ public final RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, No
                 break;
         }
         instance = factory().createBaseException(cls, message, arguments);
+        final Object[] excAttrs = SYNTAX_ERROR_ATTR_FACTORY.create();
         SourceSection section = location.getSourceSection();
         Source source = section.getSource();
         String path = source.getPath();
-        final String filename = path != null ? path : source.getName() != null ? source.getName() : "<string>";
+        excAttrs[SyntaxErrorBuiltins.IDX_FILENAME] = (path != null) ? path : source.getName() != null ? source.getName() : "<string>";
+        excAttrs[SyntaxErrorBuiltins.IDX_LINENO] = section.getStartLine();
+        excAttrs[SyntaxErrorBuiltins.IDX_OFFSET] = section.getStartColumn();
         String msg = "invalid syntax";
         if (type == PythonParser.ErrorType.Print) {
             CharSequence line = source.getCharacters(section.getStartLine());
@@ -1122,7 +1126,9 @@ public final RuntimeException raiseInvalidSyntax(PythonParser.ErrorType type, No
         // Not very nice. This counts on the implementation in traceback.py where if the value of
         // text attribute is NONE, then the line is not printed
         final String text = section.isAvailable() ? source.getCharacters(section.getStartLine()).toString() : null;
-        instance.setExceptionAttributes(new Object[]{msg, filename, section.getStartLine(), section.getStartColumn(), text});
+        excAttrs[SyntaxErrorBuiltins.IDX_MSG] = msg;
+        excAttrs[SyntaxErrorBuiltins.IDX_TEXT] = text;
+        instance.setExceptionAttributes(excAttrs);
         throw PException.fromObject(instance, location, PythonOptions.isPExceptionWithJavaStacktrace(getLanguage()));
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/BaseExceptionAttrNode.java

@@ -56,6 +56,14 @@
 public abstract class BaseExceptionAttrNode extends Node {
     public interface StorageFactory {
         Object[] create(Object[] args, PythonObjectFactory factory);
+
+        default Object[] create(Object[] args) {
+            return create(args, null);
+        }
+
+        default Object[] create() {
+            return create(null);
+        }
     }
 
     public abstract Object execute(PBaseException self, Object value, int index, StorageFactory factory);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/StopIterationBuiltins.java

@@ -59,9 +59,7 @@
 @CoreFunctions(extendClasses = PythonBuiltinClassType.StopIteration)
 public final class StopIterationBuiltins extends PythonBuiltins {
 
-    public static final BaseExceptionAttrNode.StorageFactory STOP_ITERATION_ATTR_FACTORY = (args, factory) -> {
-        return new Object[]{(args != null && args.length > 0) ? args[0] : PNone.NONE};
-    };
+    public static final BaseExceptionAttrNode.StorageFactory STOP_ITERATION_ATTR_FACTORY = (args, factory) -> new Object[]{(args != null && args.length > 0) ? args[0] : PNone.NONE};
 
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/SyntaxErrorBuiltins.java

@@ -77,17 +77,15 @@
 @CoreFunctions(extendClasses = {PythonBuiltinClassType.SyntaxError, PythonBuiltinClassType.IndentationError, PythonBuiltinClassType.TabError})
 public final class SyntaxErrorBuiltins extends PythonBuiltins {
 
-    static final int IDX_MSG = 0;
-    static final int IDX_FILENAME = 1;
-    static final int IDX_LINENO = 2;
-    static final int IDX_OFFSET = 3;
-    static final int IDX_TEXT = 4;
-    static final int IDX_PRINT_FILE_AND_LINE = 5;
+    public static final int IDX_MSG = 0;
+    public static final int IDX_FILENAME = 1;
+    public static final int IDX_LINENO = 2;
+    public static final int IDX_OFFSET = 3;
+    public static final int IDX_TEXT = 4;
+    public static final int IDX_PRINT_FILE_AND_LINE = 5;
     public static final int SYNTAX_ERR_NUM_ATTRS = IDX_PRINT_FILE_AND_LINE + 1;
 
-    public static final BaseExceptionAttrNode.StorageFactory SYNTAX_ERROR_ATTR_FACTORY = (args, factory) -> {
-        return new Object[SYNTAX_ERR_NUM_ATTRS];
-    };
+    public static final BaseExceptionAttrNode.StorageFactory SYNTAX_ERROR_ATTR_FACTORY = (args, factory) -> new Object[SYNTAX_ERR_NUM_ATTRS];
 
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/UnicodeErrorBuiltins.java

@@ -73,9 +73,7 @@ public final class UnicodeErrorBuiltins extends PythonBuiltins {
     static final int IDX_REASON = 4;
     public static final int UNICODE_ERR_NUM_ATTRS = IDX_REASON + 1;
 
-    public static final BaseExceptionAttrNode.StorageFactory UNICODE_ERROR_ATTR_FACTORY = (args, factory) -> {
-        return new Object[UNICODE_ERR_NUM_ATTRS];
-    };
+    public static final BaseExceptionAttrNode.StorageFactory UNICODE_ERROR_ATTR_FACTORY = (args, factory) -> new Object[UNICODE_ERR_NUM_ATTRS];
 
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/SSLErrorBuiltins.java

@@ -79,9 +79,7 @@ public class SSLErrorBuiltins extends PythonBuiltins {
     static final int IDX_VERIFY_MESSAGE = IDX_WRITTEN + 4;
     static final int SSL_ERR_NUM_ATTRS = IDX_VERIFY_MESSAGE + 1;
 
-    public static final BaseExceptionAttrNode.StorageFactory SSL_ERROR_ATTR_FACTORY = (args, factory) -> {
-        return new Object[SSL_ERR_NUM_ATTRS];
-    };
+    public static final BaseExceptionAttrNode.StorageFactory SSL_ERROR_ATTR_FACTORY = (args, factory) -> new Object[SSL_ERR_NUM_ATTRS];
 
     @Override
     protected List<? extends NodeFactory<? extends PythonBuiltinBaseNode>> getNodeFactories() {