Fix some merge problems

2 files changed, 0 insertions, 124 deletions

diff --git a/ext/json/ext/parser/mkmf.log b/ext/json/ext/parser/mkmf.log
deleted file mode 100644
index e725db5..0000000
--- a/ext/json/ext/parser/mkmf.log
+++ /dev/null
@@ -1,60 +0,0 @@
-have_func: checking for rb_enc_raise() in ruby.h... -------------------- yes
-
-"gcc -o conftest -I/Users/flori/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0/x86_64-darwin15 -I/Users/flori/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0/ruby/backward -I/Users/flori/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0 -I.  -I/usr/local/opt/libyaml/include -I/usr/local/opt/readline/include -I/usr/local/opt/libksba/include -I/usr/local/opt/openssl/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -fno-fast-math -ggdb3 -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration -Wdivision-by-zero -Wdeprecated-declarations -Wextra-tokens  -fno-common -pipe conftest.c  -L. -L/Users/flori/.rvm/rubies/ruby-2.3.1/lib -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib -L. -fstack-protector -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib     -lruby.2.3.0  -lpthread -ldl -lobjc "
-checked program was:
-/* begin */
-1: #include "ruby.h"
-2: 
-3: int main(int argc, char **argv)
-4: {
-5:   return 0;
-6: }
-/* end */
-
-"gcc -o conftest -I/Users/flori/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0/x86_64-darwin15 -I/Users/flori/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0/ruby/backward -I/Users/flori/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0 -I.  -I/usr/local/opt/libyaml/include -I/usr/local/opt/readline/include -I/usr/local/opt/libksba/include -I/usr/local/opt/openssl/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -fno-fast-math -ggdb3 -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration -Wdivision-by-zero -Wdeprecated-declarations -Wextra-tokens  -fno-common -pipe conftest.c  -L. -L/Users/flori/.rvm/rubies/ruby-2.3.1/lib -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib -L. -fstack-protector -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib     -lruby.2.3.0  -lpthread -ldl -lobjc "
-conftest.c:15:57: error: use of undeclared identifier 'rb_enc_raise'
-int t(void) { void ((*volatile p)()); p = (void ((*)()))rb_enc_raise; return !p; }
-                                                        ^
-1 error generated.
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: #include <ruby.h>
- 4: 
- 5: /*top*/
- 6: extern int t(void);
- 7: int main(int argc, char **argv)
- 8: {
- 9:   if (argc > 1000000) {
-10:     printf("%p", &t);
-11:   }
-12: 
-13:   return 0;
-14: }
-15: int t(void) { void ((*volatile p)()); p = (void ((*)()))rb_enc_raise; return !p; }
-/* end */
-
-"gcc -o conftest -I/Users/flori/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0/x86_64-darwin15 -I/Users/flori/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0/ruby/backward -I/Users/flori/.rvm/rubies/ruby-2.3.1/include/ruby-2.3.0 -I.  -I/usr/local/opt/libyaml/include -I/usr/local/opt/readline/include -I/usr/local/opt/libksba/include -I/usr/local/opt/openssl/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT    -O3 -fno-fast-math -ggdb3 -Wall -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wunused-variable -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration -Wdivision-by-zero -Wdeprecated-declarations -Wextra-tokens  -fno-common -pipe conftest.c  -L. -L/Users/flori/.rvm/rubies/ruby-2.3.1/lib -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib -L. -fstack-protector -L/usr/local/opt/libyaml/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/libksba/lib -L/usr/local/opt/openssl/lib     -lruby.2.3.0  -lpthread -ldl -lobjc "
-checked program was:
-/* begin */
- 1: #include "ruby.h"
- 2: 
- 3: #include <ruby.h>
- 4: 
- 5: /*top*/
- 6: extern int t(void);
- 7: int main(int argc, char **argv)
- 8: {
- 9:   if (argc > 1000000) {
-10:     printf("%p", &t);
-11:   }
-12: 
-13:   return 0;
-14: }
-15: extern void rb_enc_raise();
-16: int t(void) { rb_enc_raise(); return 0; }
-/* end */
-
---------------------
-
diff --git a/ext/json/ext/parser/parser.c b/ext/json/ext/parser/parser.c
index f3e2502..a65d17d 100644
--- a/ext/json/ext/parser/parser.c
+++ b/ext/json/ext/parser/parser.c
@@ -1810,15 +1810,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 
-<<<<<<< 066bc5c70082f719951f398f4e20894571f8986c
-<<<<<<< 2e06c964fceb550203659db23971459bc9d35054
 #line 1814 "parser.c"
-=======
-#line 1801 "parser.c"
->>>>>>> Exception encoding
-=======
-#line 1809 "parser.c"
->>>>>>> Optional hash in rb_scan_args
 enum {JSON_start = 1};
 enum {JSON_first_final = 10};
 enum {JSON_error = 0};
@@ -1826,15 +1818,7 @@ enum {JSON_error = 0};
 enum {JSON_en_main = 1};
 
 
-<<<<<<< 066bc5c70082f719951f398f4e20894571f8986c
-<<<<<<< 2e06c964fceb550203659db23971459bc9d35054
 #line 722 "parser.rl"
-=======
-#line 709 "parser.rl"
->>>>>>> Exception encoding
-=======
-#line 717 "parser.rl"
->>>>>>> Optional hash in rb_scan_args
 
 
 /*
@@ -1851,40 +1835,16 @@ static VALUE cParser_parse(VALUE self)
   GET_PARSER;
 
 
-<<<<<<< 066bc5c70082f719951f398f4e20894571f8986c
-<<<<<<< 2e06c964fceb550203659db23971459bc9d35054
 #line 1839 "parser.c"
-=======
-#line 1826 "parser.c"
->>>>>>> Exception encoding
-=======
-#line 1834 "parser.c"
->>>>>>> Optional hash in rb_scan_args
 	{
 	cs = JSON_start;
 	}
 
-<<<<<<< 066bc5c70082f719951f398f4e20894571f8986c
-<<<<<<< 2e06c964fceb550203659db23971459bc9d35054
 #line 738 "parser.rl"
   p = json->source;
   pe = p + json->len;
 
 #line 1848 "parser.c"
-=======
-#line 725 "parser.rl"
-  p = json->source;
-  pe = p + json->len;
-
-#line 1835 "parser.c"
->>>>>>> Exception encoding
-=======
-#line 733 "parser.rl"
-  p = json->source;
-  pe = p + json->len;
-
-#line 1843 "parser.c"
->>>>>>> Optional hash in rb_scan_args
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1918,15 +1878,7 @@ st0:
 cs = 0;
 	goto _out;
 tr2:
-<<<<<<< 066bc5c70082f719951f398f4e20894571f8986c
-<<<<<<< 2e06c964fceb550203659db23971459bc9d35054
 #line 714 "parser.rl"
-=======
-#line 701 "parser.rl"
->>>>>>> Exception encoding
-=======
-#line 709 "parser.rl"
->>>>>>> Optional hash in rb_scan_args
 	{
         char *np = JSON_parse_value(json, p, pe, &result);
         if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
@@ -1936,15 +1888,7 @@ st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-<<<<<<< 066bc5c70082f719951f398f4e20894571f8986c
-<<<<<<< 2e06c964fceb550203659db23971459bc9d35054
 #line 1892 "parser.c"
-=======
-#line 1879 "parser.c"
->>>>>>> Exception encoding
-=======
-#line 1887 "parser.c"
->>>>>>> Optional hash in rb_scan_args
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -2033,15 +1977,7 @@ case 9:
 	_out: {}
 	}
 
-<<<<<<< 066bc5c70082f719951f398f4e20894571f8986c
-<<<<<<< 2e06c964fceb550203659db23971459bc9d35054
 #line 741 "parser.rl"
-=======
-#line 728 "parser.rl"
->>>>>>> Exception encoding
-=======
-#line 736 "parser.rl"
->>>>>>> Optional hash in rb_scan_args
 
   if (cs >= JSON_first_final && p == pe) {
     return result;