syck 1.4.1 → 1.5.1

data/ext/syck/gram.h

@@ -1,12 +1,14 @@
-/* A Bison parser, made by GNU Bison 1.875d.  */
+/* A Bison parser, made by GNU Bison 3.8.2.  */
 
-/* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Bison interface for Yacc-like parsers in C
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2021 Free Software Foundation,
+   Inc.
+
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,66 +16,82 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-/* As a special exception, when this file is copied by Bison into a
-   Bison output file, you may use that output file without restriction.
-   This special exception was added by the Free Software Foundation
-   in version 1.24 of Bison.  */
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
 
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     YAML_ANCHOR = 258,
-     YAML_ALIAS = 259,
-     YAML_TRANSFER = 260,
-     YAML_TAGURI = 261,
-     YAML_ITRANSFER = 262,
-     YAML_WORD = 263,
-     YAML_PLAIN = 264,
-     YAML_BLOCK = 265,
-     YAML_DOCSEP = 266,
-     YAML_IOPEN = 267,
-     YAML_INDENT = 268,
-     YAML_IEND = 269
-   };
-#endif
-#define YAML_ANCHOR 258
-#define YAML_ALIAS 259
-#define YAML_TRANSFER 260
-#define YAML_TAGURI 261
-#define YAML_ITRANSFER 262
-#define YAML_WORD 263
-#define YAML_PLAIN 264
-#define YAML_BLOCK 265
-#define YAML_DOCSEP 266
-#define YAML_IOPEN 267
-#define YAML_INDENT 268
-#define YAML_IEND 269
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
 
+/* DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual,
+   especially those whose name start with YY_ or yy_.  They are
+   private implementation details that can be changed or removed.  */
 
+#ifndef YY_YY_GRAM_H_INCLUDED
+# define YY_YY_GRAM_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int yydebug;
+#endif
 
+/* Token kinds.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    YYEMPTY = -2,
+    YYEOF = 0,                     /* "end of file"  */
+    YYerror = 256,                 /* error  */
+    YYUNDEF = 257,                 /* "invalid token"  */
+    YAML_ANCHOR = 258,             /* YAML_ANCHOR  */
+    YAML_ALIAS = 259,              /* YAML_ALIAS  */
+    YAML_TRANSFER = 260,           /* YAML_TRANSFER  */
+    YAML_TAGURI = 261,             /* YAML_TAGURI  */
+    YAML_ITRANSFER = 262,          /* YAML_ITRANSFER  */
+    YAML_WORD = 263,               /* YAML_WORD  */
+    YAML_PLAIN = 264,              /* YAML_PLAIN  */
+    YAML_BLOCK = 265,              /* YAML_BLOCK  */
+    YAML_DOCSEP = 266,             /* YAML_DOCSEP  */
+    YAML_IOPEN = 267,              /* YAML_IOPEN  */
+    YAML_INDENT = 268,             /* YAML_INDENT  */
+    YAML_IEND = 269                /* YAML_IEND  */
+  };
+  typedef enum yytokentype yytoken_kind_t;
+#endif
 
-#if ! defined (YYSTYPE) && ! defined (YYSTYPE_IS_DECLARED)
+/* Value type.  */
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+union YYSTYPE
+{
 #line 35 "gram.y"
-typedef union YYSTYPE {
+
     SYMID nodeId;
     SyckNode *nodeData;
     char *name;
-} YYSTYPE;
-/* Line 1285 of yacc.c.  */
-#line 71 "gram.h"
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+
+#line 84 "gram.h"
+
+};
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
 
 
 
+int yyparse (void *YYPARSE_PARAM);
+
 
+#endif /* !YY_YY_GRAM_H_INCLUDED  */

data/ext/syck/rubyext.c

@@ -322,7 +322,7 @@ mktime_do(VALUE varg)
 }
 
 VALUE
-mktime_r(VALUE varg)
+mktime_r(VALUE varg, VALUE errinfo)
 {
     struct mktime_arg *arg = (struct mktime_arg *)varg;
 
@@ -351,7 +351,13 @@ rb_syck_mktime(const char *str, long len)
  * (see http://www.yaml.org/type/merge/)
  */
 VALUE
-syck_merge_i(VALUE entry, VALUE hsh )
+syck_merge_i(
+#ifdef RB_BLOCK_CALL_FUNC_ARGLIST
+    RB_BLOCK_CALL_FUNC_ARGLIST(entry, hsh)
+#else
+    VALUE entry, VALUE hsh
+#endif
+)
 {
     VALUE tmp;
     if ( !NIL_P(tmp = rb_check_convert_type(entry, T_HASH, "Hash", "to_hash")) )
@@ -649,7 +655,7 @@ rb_syck_load_handler(SyckParser *p, SyckNode *n)
     /*
      * Create node,
      */
-    obj = rb_funcall( resolver, s_node_import, 1, Data_Wrap_Struct( cNode, NULL, NULL, n ) );
+    obj = rb_funcall( resolver, s_node_import, 1, Data_Wrap_Struct( cNode, syck_node_mark, NULL, n ) );
 
     /*
      * ID already set, let's alter the symbol table to accept the new object
@@ -733,9 +739,9 @@ syck_set_model(VALUE p, VALUE input, VALUE model)
 }
 
 static int
-syck_st_mark_nodes( char *key, SyckNode *n, char *arg )
+syck_st_mark_nodes( st_data_t key, st_data_t n, st_data_t arg )
 {
-    if ( n != (void *)1 ) syck_node_mark( n );
+    if ( n != 1 ) syck_node_mark( (SyckNode *)n );
     return ST_CONTINUE;
 }
 
@@ -1042,7 +1048,13 @@ syck_resolver_node_import(VALUE self, VALUE node)
  * Set instance variables
  */
 VALUE
-syck_set_ivars(VALUE vars, VALUE obj)
+syck_set_ivars(
+#ifdef RB_BLOCK_CALL_FUNC_ARGLIST
+    RB_BLOCK_CALL_FUNC_ARGLIST(vars, obj)
+#else
+    VALUE vars, VALUE obj
+#endif
+)
 {
     VALUE ivname = rb_ary_entry( vars, 0 );
     char *ivn;
@@ -2231,6 +2243,7 @@ Init_syck()
      * Define YAML::Syck::Node class
      */
     cNode = rb_define_class_under( rb_syck, "Node", rb_cObject );
+    rb_undef_alloc_func(cNode);
     rb_undef( cNode, rb_intern("initialize_copy") );
     rb_define_attr( cNode, "emitter", 1, 1 );
     rb_define_attr( cNode, "resolver", 1, 1 );

data/ext/syck/syck.c

@@ -201,10 +201,14 @@ syck_lookup_sym( SyckParser *p, SYMID id, void **datap )
 }
 
 int
-syck_st_free_nodes( char *key, SyckNode *n, char *arg )
-{
-    if ( n != (void *)1 ) syck_free_node( n );
-    n = NULL;
+syck_st_free_nodes( st_data_t key, st_data_t n, st_data_t arg )
+{
+    if ( n != 1 ) syck_free_node( (SyckNode *)n );
+    /* Previously, this codde declared the `n` parameter as `SyckNode *`, and this
+     * code said `n = NULL`. That's obviously a no-op, and this code _probably_ should
+     * have said `*n = NULL`. However I'm terrified of actually changing Syck's behaviour
+     * at this juncture, so I'll just adjust the type of the assignment to 0 from NULL. */
+    n = 0;
     return ST_CONTINUE;
 }
 
@@ -238,10 +242,11 @@ typedef struct {
 } bytestring_t;
 
 int
-syck_st_free_syms( void *key, bytestring_t *sav, void *dummy )
+syck_st_free_syms( st_data_t key, st_data_t sav, st_data_t dummy )
 {
-    S_FREE(sav->buffer);
-    S_FREE(sav);
+    bytestring_t *sav_ptr = (bytestring_t *)sav;
+    S_FREE(sav_ptr->buffer);
+    S_FREE(sav_ptr);
     return ST_CONTINUE;
 }
 

data/lib/syck/constants.rb

@@ -6,7 +6,7 @@ module Syck
 	#
 	# Constants
 	#
-	VERSION = '1.4.1'
+	VERSION = '1.5.1'
 	SUPPORTED_YAML_VERSIONS = ['1.0']
 
 	#

data/syck.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "syck"
-  s.version = "1.4.1"
+  s.version = "1.5.1"
 
   s.summary = "A gemified version of Syck from Ruby's stdlib"
   s.description = "A gemified version of Syck from Ruby's stdlib.  Syck has been removed from\nRuby's stdlib, and this gem is meant to bridge the gap for people that haven't\nupdated their YAML yet."
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.license = "MIT"
   s.require_paths = ["lib"]
   s.extensions = ["ext/syck/extconf.rb"]
-  s.files = Dir["[A-Z]*", "ext/**/*", "lib/**/*.rb", "test/**/*.rb"] - %w[Gemfile.lock]
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc"]
+  s.files = Dir["[A-Z]*", "ext/**/*", "lib/**/*.rb", "test/**/*.rb"] - %w[Gemfile.lock ext/syck/gram.y]
+  s.extra_rdoc_files = ["README.rdoc"]
   s.test_files = Dir["test/**/*.rb"]
   s.rdoc_options = ["--main", "README.rdoc"]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0.0")

data/test/test_gc.rb

@@ -0,0 +1,34 @@
+require 'helper'
+
+module Syck
+  class TestGC < Test::Unit::TestCase
+    def setup
+      @big_array = 20.times.map do |i|
+        h = {}
+        %w[a b c].each do |k|
+          h[k] = Random.bytes(16).unpack('H*').first
+        end
+        %w[d e f].each do |k|
+          h[k] = Random.rand(0...100_000)
+        end
+        h
+      end
+      GC.stress = true
+    end
+
+    def teardown
+      GC.stress = false
+    end
+
+    def test_dump_load_many_hashes
+      yaml = Syck.dump(@big_array)
+      2.times { Syck.load(yaml) }
+      # If it doesn't segfault, it passed
+    end
+
+    def test_dump_parse_many_hashes
+      yaml = Syck.dump(@big_array)
+      2.times { Syck.parse(yaml) }
+    end
+  end
+end

data/test/test_yaml.rb

@@ -15,7 +15,7 @@ module Syck
 class YAML_Unit_Tests < Test::Unit::TestCase
     # [ruby-core:34969]
     def test_regexp_with_n
-        assert_cycle(Regexp.new('',0,'n'))
+        assert_cycle(Regexp.new('', 0))
     end
 
 	#

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: syck
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Hiroshi SHIBATA
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2024-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,14 +65,13 @@ executables: []
 extensions:
 - ext/syck/extconf.rb
 extra_rdoc_files:
-- CHANGELOG.rdoc
 - README.rdoc
 files:
-- CHANGELOG.rdoc
 - Gemfile
 - README.rdoc
 - Rakefile
 - ext/syck/bytecode.c
+- ext/syck/compile_commands.json
 - ext/syck/emitter.c
 - ext/syck/extconf.h
 - ext/syck/extconf.rb
@@ -103,12 +102,14 @@ files:
 - lib/syck/yamlnode.rb
 - lib/syck/ypath.rb
 - lib/yaml/syck.rb
+- syck-1.5.0.gem
 - syck.gemspec
 - test/helper.rb
 - test/test_array.rb
 - test/test_boolean.rb
 - test/test_class.rb
 - test/test_exception.rb
+- test/test_gc.rb
 - test/test_hash.rb
 - test/test_null.rb
 - test/test_omap.rb
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 0.9.5
 requirements: []
-rubygems_version: 3.4.0.dev
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: A gemified version of Syck from Ruby's stdlib
@@ -150,6 +151,7 @@ test_files:
 - test/test_boolean.rb
 - test/test_class.rb
 - test/test_exception.rb
+- test/test_gc.rb
 - test/test_hash.rb
 - test/test_null.rb
 - test/test_omap.rb

data/CHANGELOG.rdoc

@@ -1,36 +0,0 @@
-=== 1.4.0 / 2019-01-04
-
-  * Support to build with Ruby 2.6.
-
-=== 1.3.0 / 2017-05-02
-
-Compatibility Changes:
-
-  * Removed `YAML::EngineManager`. It's not working after Ruby 2.2.
-    We completely gave up to support it.
-
-=== 1.2.0 / 2016-11-12
-
-Bug fixes:
-
- * Fix build error with Ruby 2.4.0
-
-=== 1.1.0 / 2016-03-22
-
-Bug fixes:
-
- * Fix broken tests with Ruby 2.0.0 or later.
-
-Enhancements:
-
- * Skipped Syck specific methods on Psych engine.
-
-Known issues:
-
- * Can't switch back to Psych.
-
-=== 1.0.0 / 2012-09-24
-
-* 1 major enhancement
-
-  * Birthday!