Import ruby/prism@fc38325

Author: andrykonchin

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

@@ -26,6 +26,7 @@
 
 #include <assert.h>
 #include <errno.h>
+#include <locale.h>
 #include <math.h>
 #include <stdarg.h>
 #include <stdbool.h>
@@ -222,10 +223,12 @@ const char * pm_token_type_human(pm_token_type_t token_type);
  * Format the errors on the parser into the given buffer.
  *
  * @param parser The parser to format the errors for.
+ * @param error_list The list of errors to format.
  * @param buffer The buffer to format the errors into.
  * @param colorize Whether or not to colorize the errors with ANSI escape sequences.
+ * @param inline_messages Whether or not to inline the messages with the source.
  */
-PRISM_EXPORTED_FUNCTION void pm_parser_errors_format(const pm_parser_t *parser, pm_buffer_t *buffer, bool colorize);
+PRISM_EXPORTED_FUNCTION void pm_parser_errors_format(const pm_parser_t *parser, const pm_list_t *error_list, pm_buffer_t *buffer, bool colorize, bool inline_messages);
 
 // We optionally support dumping to JSON. For systems that don't want or need
 // this functionality, it can be turned off with the PRISM_EXCLUDE_JSON define.

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

@@ -5823,10 +5823,10 @@ typedef enum pm_integer_base_flags {
  * Flags for interpolated string nodes that indicated mutability if they are also marked as literals.
  */
 typedef enum pm_interpolated_string_node_flags {
-    /** frozen by virtue of a `frozen_string_literal: true` comment or `--enable-frozen-string-literal` */
+    /** frozen by virtue of a `frozen_string_literal: true` comment or `--enable-frozen-string-literal`; only for adjacent string literals like `'a' 'b'` */
     PM_INTERPOLATED_STRING_NODE_FLAGS_FROZEN = 1,
 
-    /** mutable by virtue of a `frozen_string_literal: false` comment or `--disable-frozen-string-literal` */
+    /** mutable by virtue of a `frozen_string_literal: false` comment or `--disable-frozen-string-literal`; only for adjacent string literals like `'a' 'b'` */
     PM_INTERPOLATED_STRING_NODE_FLAGS_MUTABLE = 2,
 } pm_interpolated_string_node_flags_t;
 

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

@@ -29,6 +29,7 @@
 typedef enum {
     // These are the error diagnostics.
     PM_ERR_ALIAS_ARGUMENT,
+    PM_ERR_ALIAS_ARGUMENT_NUMBERED_REFERENCE,
     PM_ERR_AMPAMPEQ_MULTI_ASSIGN,
     PM_ERR_ARGUMENT_AFTER_BLOCK,
     PM_ERR_ARGUMENT_AFTER_FORWARDING_ELLIPSES,
@@ -75,6 +76,7 @@ typedef enum {
     PM_ERR_CLASS_SUPERCLASS,
     PM_ERR_CLASS_TERM,
     PM_ERR_CLASS_UNEXPECTED_END,
+    PM_ERR_CLASS_VARIABLE_BARE,
     PM_ERR_CONDITIONAL_ELSIF_PREDICATE,
     PM_ERR_CONDITIONAL_IF_PREDICATE,
     PM_ERR_CONDITIONAL_PREDICATE_TERM,
@@ -136,6 +138,7 @@ typedef enum {
     PM_ERR_FOR_IN,
     PM_ERR_FOR_INDEX,
     PM_ERR_FOR_TERM,
+    PM_ERR_GLOBAL_VARIABLE_BARE,
     PM_ERR_HASH_EXPRESSION_AFTER_LABEL,
     PM_ERR_HASH_KEY,
     PM_ERR_HASH_ROCKET,
@@ -147,6 +150,7 @@ typedef enum {
     PM_ERR_INCOMPLETE_VARIABLE_CLASS_3_3_0,
     PM_ERR_INCOMPLETE_VARIABLE_INSTANCE,
     PM_ERR_INCOMPLETE_VARIABLE_INSTANCE_3_3_0,
+    PM_ERR_INSTANCE_VARIABLE_BARE,
     PM_ERR_INVALID_CHARACTER,
     PM_ERR_INVALID_ENCODING_MAGIC_COMMENT,
     PM_ERR_INVALID_FLOAT_EXPONENT,
@@ -195,7 +199,7 @@ typedef enum {
     PM_ERR_PARAMETER_BLOCK_MULTI,
     PM_ERR_PARAMETER_CIRCULAR,
     PM_ERR_PARAMETER_METHOD_NAME,
-    PM_ERR_PARAMETER_NAME_REPEAT,
+    PM_ERR_PARAMETER_NAME_DUPLICATED,
     PM_ERR_PARAMETER_NO_DEFAULT,
     PM_ERR_PARAMETER_NO_DEFAULT_KW,
     PM_ERR_PARAMETER_NUMBERED_RESERVED,
@@ -204,6 +208,7 @@ typedef enum {
     PM_ERR_PARAMETER_STAR,
     PM_ERR_PARAMETER_UNEXPECTED_FWD,
     PM_ERR_PARAMETER_WILD_LOOSE_COMMA,
+    PM_ERR_PATTERN_CAPTURE_DUPLICATE,
     PM_ERR_PATTERN_EXPRESSION_AFTER_BRACKET,
     PM_ERR_PATTERN_EXPRESSION_AFTER_COMMA,
     PM_ERR_PATTERN_EXPRESSION_AFTER_HROCKET,
@@ -215,6 +220,7 @@ typedef enum {
     PM_ERR_PATTERN_EXPRESSION_AFTER_RANGE,
     PM_ERR_PATTERN_EXPRESSION_AFTER_REST,
     PM_ERR_PATTERN_HASH_KEY,
+    PM_ERR_PATTERN_HASH_KEY_DUPLICATE,
     PM_ERR_PATTERN_HASH_KEY_LABEL,
     PM_ERR_PATTERN_IDENT_AFTER_HROCKET,
     PM_ERR_PATTERN_LABEL_AFTER_COMMA,
@@ -235,6 +241,7 @@ typedef enum {
     PM_ERR_RESCUE_TERM,
     PM_ERR_RESCUE_VARIABLE,
     PM_ERR_RETURN_INVALID,
+    PM_ERR_SCRIPT_NOT_FOUND,
     PM_ERR_SINGLETON_FOR_LITERALS,
     PM_ERR_STATEMENT_ALIAS,
     PM_ERR_STATEMENT_POSTEXE_END,
@@ -285,6 +292,7 @@ typedef enum {
     PM_WARN_KEYWORD_EOL,
     PM_WARN_LITERAL_IN_CONDITION_DEFAULT,
     PM_WARN_LITERAL_IN_CONDITION_VERBOSE,
+    PM_WARN_SHEBANG_CARRIAGE_RETURN,
     PM_WARN_UNEXPECTED_CARRIAGE_RETURN,
 } pm_diagnostic_id_t;
 
@@ -324,11 +332,14 @@ typedef struct {
  * The levels of errors generated during parsing.
  */
 typedef enum {
-    /** For errors that cannot be recovered from. */
-    PM_ERROR_LEVEL_FATAL = 0,
+    /** For errors that should raise a syntax error. */
+    PM_ERROR_LEVEL_SYNTAX = 0,
 
     /** For errors that should raise an argument error. */
-    PM_ERROR_LEVEL_ARGUMENT = 1
+    PM_ERROR_LEVEL_ARGUMENT = 1,
+
+    /** For errors that should raise a load error. */
+    PM_ERROR_LEVEL_LOAD = 2
 } pm_error_level_t;
 
 /**

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

@@ -66,12 +66,6 @@ typedef struct {
      */
     int32_t line;
 
-    /**
-     * The offset within the file that the parse starts on. This value is
-     * 0-indexed.
-     */
-    uint32_t offset;
-
     /**
      * The name of the encoding that the source file is in. Note that this must
      * correspond to a name that can be found with Encoding.find in Ruby.
@@ -164,14 +158,6 @@ PRISM_EXPORTED_FUNCTION void pm_options_filepath_set(pm_options_t *options, cons
  */
 PRISM_EXPORTED_FUNCTION void pm_options_line_set(pm_options_t *options, int32_t line);
 
-/**
- * Set the offset option on the given options struct.
- *
- * @param options The options struct to set the offset on.
- * @param offset The offset to set.
- */
-PRISM_EXPORTED_FUNCTION void pm_options_offset_set(pm_options_t *options, uint32_t offset);
-
 /**
  * Set the encoding option on the given options struct.
  *
@@ -267,7 +253,6 @@ PRISM_EXPORTED_FUNCTION void pm_options_free(pm_options_t *options);
  * | `4`     | the length of the filepath |
  * | ...     | the filepath bytes         |
  * | `4`     | the line number            |
- * | `4`     | the offset                 |
  * | `4`     | the length the encoding    |
  * | ...     | the encoding bytes         |
  * | `1`     | frozen string literal      |

src/main/c/yarp/include/prism/util/pm_newline_list.h

@@ -61,6 +61,14 @@ typedef struct {
  */
 bool pm_newline_list_init(pm_newline_list_t *list, const uint8_t *start, size_t capacity);
 
+/**
+ * Clear out the newlines that have been appended to the list.
+ *
+ * @param list The list to clear.
+ */
+void
+pm_newline_list_clear(pm_newline_list_t *list);
+
 /**
  * Append a new offset to the newline list. Returns true if the reallocation of
  * the offsets succeeds (if one was necessary), otherwise returns false.