Adopt YARP's latest changes

Author: eregon

mx.truffleruby/mx_truffleruby.py

@@ -131,20 +131,6 @@ def __init__(self, suite, name, deps, workingSets, output=None, **kwArgs):
             results=kwArgs.pop('results'),
             output=path, d=path, vpath=False, **kwArgs)
 
-    def getBuildTask(self, args):
-        return YARPNativeBuildTask(args, self)
-
-class YARPNativeBuildTask(mx.NativeBuildTask):
-    def build(self):
-        mx.run(['./configure'], cwd=self.subject.dir)
-        super(YARPNativeBuildTask, self).build() # make
-
-    def clean(self, forBuild=False):
-        if exists(join(self.subject.dir, 'Makefile')):
-            super(YARPNativeBuildTask, self).clean(forBuild=forBuild)
-        else:
-            pass
-
 # Commands
 
 def jt(*args):

src/main/java/org/truffleruby/debug/TruffleDebugNodes.java

@@ -293,7 +293,7 @@ protected Object parse(Object code,
 
             var yarpSource = YARPTranslatorDriver.createYARPSource(source, YARPTranslatorDriver.createRubySource(code));
             var parseResult = Loader.load(serialized, yarpSource);
-            var ast = parseResult.getValue();
+            var ast = parseResult.value;
 
             return createString(fromJavaStringNode, ast.toString(), Encodings.UTF_8);
         }

src/main/java/org/truffleruby/parser/YARPTranslatorDriver.java

@@ -389,8 +389,7 @@ private String getMethodName(ParserContext parserContext, MaterializedFrame pare
     }
 
     public static org.yarp.Nodes.Node parseToYARPAST(RubyContext context, RubyLanguage language, RubySource rubySource,
-            StaticScope blockScope,
-            ParserConfiguration configuration, RubyDeferredWarnings rubyWarnings) {
+            StaticScope blockScope, ParserConfiguration configuration, RubyDeferredWarnings rubyWarnings) {
         //        LexerSource lexerSource = new LexerSource(rubySource);
         // We only need to pass in current scope if we are evaluating as a block (which
         // is only done for evals).  We need to pass this in so that we can appropriately scope
@@ -410,15 +409,15 @@ public static org.yarp.Nodes.Node parseToYARPAST(RubyContext context, RubyLangua
         var parseResult = Loader.load(serializedBytes, yarpSource);
 
         final String filename = rubySource.getSourcePath();
-        final ParseResult.Error[] errors = parseResult.getErrors();
+        final ParseResult.Error[] errors = parseResult.errors;
 
         // collect warnings generated by the parser
-        for (ParseResult.Warning warning : parseResult.getWarnings()) {
-            Nodes.Location location = warning.getLocation();
+        for (ParseResult.Warning warning : parseResult.warnings) {
+            Nodes.Location location = warning.location;
             SourceSection section = rubySource.getSource().createSection(location.startOffset, location.length);
             int lineNumber = RubySource.getStartLineAdjusted(context, section);
 
-            rubyWarnings.warn(filename, lineNumber, warning.getMessage());
+            rubyWarnings.warn(filename, lineNumber, warning.message);
         }
 
         if (errors.length != 0) {
@@ -433,9 +432,9 @@ public static org.yarp.Nodes.Node parseToYARPAST(RubyContext context, RubyLangua
             // but it isn't guarantied that the first error is the most specific/relevant to user
             ParseResult.Error error = errors[0];
 
-            Nodes.Location location = error.getLocation();
+            Nodes.Location location = error.location;
             SourceSection section = rubySource.getSource().createSection(location.startOffset, location.length);
-            String message = context.fileLine(section) + ": " + error.getMessage();
+            String message = context.fileLine(section) + ": " + error.message;
 
             if (context != null) {
                 int lineNumber = RubySource.getStartLineAdjusted(context, section);
@@ -451,7 +450,7 @@ public static org.yarp.Nodes.Node parseToYARPAST(RubyContext context, RubyLangua
             }
         }
 
-        return parseResult.getValue();
+        return parseResult.value;
         // YARP end
 
         //        RubyParser parser = new RubyParser(lexerSource, rubyWarnings);

tool/import-yarp.sh

@@ -10,13 +10,12 @@ pushd $YARP
 bundle
 bundle exec rake clobber
 bundle exec rake templates
-bundle exec rake configure
 popd
 
 rm -rf src/main/c/yarp
 mkdir src/main/c/yarp
 cp -R $YARP/{include,src} src/main/c/yarp
-cp $YARP/{.gitignore,LICENSE.md,configure,config.h.in,Makefile.in} src/main/c/yarp
+cp $YARP/{.gitignore,LICENSE.md,Makefile} src/main/c/yarp
 
 rm -rf src/yarp/java
 cp -R $YARP/java src/yarp/java