[GR-45043] Update to latest YARP

PullRequest: truffleruby/4059

Author: eregon

mx.truffleruby/suite.py

@@ -219,31 +219,26 @@
             "ldflags": ["-pthread"],
         },
 
-        "org.prism.libyarp": {
+        "org.prism.libprism": {
             "class": "YARPNativeProject",
             "dir": "src/main/c/yarp",
             # "makeTarget": "all-no-debug", # Can use this to build without asserts
-            "results": ["build/librubyparser.a"],
-            "buildEnv": {
-                # system clang on macOS Mojave warns+errors for `mystruct s = { 0 };` when there are struct fields.
-                # newer compiler do not warn for this.
-                "EXTRA_CFLAGS": "-Wno-missing-braces",
-            },
+            "results": ["build/libprism.a"],
             "description": "YARP used as a static library"
         },
 
         "org.truffleruby.yarp.bindings": {
             "dir": "src/main/c/yarp_bindings",
             "native": "shared_lib",
-            "deliverable": "yarp",
+            "deliverable": "yarpbindings",
             "buildDependencies": [
-                "org.prism.libyarp", # librubyparser.a
+                "org.prism.libprism", # libprism.a
                 "org.prism", # for the generated JNI header file
             ],
             "use_jdk_headers": True, # the generated JNI header includes jni.h
-            "cflags": ["-g", "-Wall", "-Werror", "-pthread", "-I<path:org.prism.libyarp>/include"],
+            "cflags": ["-g", "-Wall", "-Werror", "-pthread", "-I<path:org.prism.libprism>/include"],
             "ldflags": ["-pthread"],
-            "ldlibs": ["<path:org.prism.libyarp>/build/librubyparser.a"],
+            "ldlibs": ["<path:org.prism.libprism>/build/libprism.a"],
             "description": "JNI bindings for YARP"
         },
 

src/main/c/yarp/Makefile

@@ -11,7 +11,7 @@ FUZZ_OUTPUT_DIR = $(shell pwd)/fuzz/output
 SOEXT := $(shell ruby -e 'puts RbConfig::CONFIG["SOEXT"]')
 
 CPPFLAGS := -Iinclude
-CFLAGS := -g -O2 -std=c99 -Wall -Werror -Wextra -Wpedantic -Wundef -Wconversion -fPIC -fvisibility=hidden $(EXTRA_CFLAGS)
+CFLAGS := -g -O2 -std=c99 -Wall -Werror -Wextra -Wpedantic -Wundef -Wconversion -Wno-missing-braces -fPIC -fvisibility=hidden
 CC := cc
 WASI_SDK_PATH := /opt/wasi-sdk
 
@@ -22,15 +22,15 @@ STATIC_OBJECTS := $(subst src/,build/static/,$(SOURCES:.c=.o))
 
 all: shared static
 
-shared: build/librubyparser.$(SOEXT)
-static: build/librubyparser.a
+shared: build/libprism.$(SOEXT)
+static: build/libprism.a
 wasm: javascript/src/prism.wasm
 
-build/librubyparser.$(SOEXT): $(SHARED_OBJECTS)
+build/libprism.$(SOEXT): $(SHARED_OBJECTS)
 	$(ECHO) "linking $@"
 	$(Q) $(CC) $(DEBUG_FLAGS) $(CFLAGS) -shared -o $@ $(SHARED_OBJECTS)
 
-build/librubyparser.a: $(STATIC_OBJECTS)
+build/libprism.a: $(STATIC_OBJECTS)
 	$(ECHO) "building $@"
 	$(Q) $(AR) $(ARFLAGS) $@ $(STATIC_OBJECTS) $(Q1:0=>/dev/null)
 

src/main/c/yarp/include/prism/diagnostic.h

@@ -231,6 +231,7 @@ typedef enum {
     PM_ERR_UNARY_RECEIVER_TILDE,
     PM_ERR_UNDEF_ARGUMENT,
     PM_ERR_UNTIL_TERM,
+    PM_ERR_VOID_EXPRESSION,
     PM_ERR_WHILE_TERM,
     PM_ERR_WRITE_TARGET_READONLY,
     PM_ERR_WRITE_TARGET_UNEXPECTED,

src/main/c/yarp/include/prism/parser.h

@@ -532,6 +532,12 @@ struct pm_parser {
         size_t index;
     } lex_modes;
 
+    /**
+     * The common_whitespace value from the most-recently-popped heredoc mode of the lexer, so we
+     * can dedent the heredoc after popping the lex mode.
+     */
+    size_t current_string_common_whitespace;
+
     /** The pointer to the start of the source. */
     const uint8_t *start;
 

src/main/c/yarp/src/diagnostic.c

@@ -244,6 +244,7 @@ static const char* const diagnostic_messages[PM_DIAGNOSTIC_ID_LEN] = {
     [PM_ERR_UNARY_RECEIVER_PLUS]                = "Expected a receiver for unary `+`",
     [PM_ERR_UNARY_RECEIVER_TILDE]               = "Expected a receiver for unary `~`",
     [PM_ERR_UNTIL_TERM]                         = "Expected an `end` to close the `until` statement",
+    [PM_ERR_VOID_EXPRESSION]                    = "Unexpected void value expression",
     [PM_ERR_WHILE_TERM]                         = "Expected an `end` to close the `while` statement",
     [PM_ERR_WRITE_TARGET_READONLY]              = "Immutable variable as a write target",
     [PM_ERR_WRITE_TARGET_UNEXPECTED]            = "Unexpected write target",