We need to remove \r from heredoc strings

enebo · enebo · commit 41fc369a6b32 · 2025-10-03T09:09:44.000-05:00
diff --git a/core/src/main/java/org/jruby/ext/ripper/HeredocTerm.java b/core/src/main/java/org/jruby/ext/ripper/HeredocTerm.java
@@ -143,7 +143,7 @@ public int parseString(RubyLexer lexer, LexerSource src) throws java.io.IOExcept
                         case '\n':
                             pend--;
                             if (pend == p || lexer.p(pend-1) == '\r') {
-                                pend++;
+                                pend--;
                                 break;
                             }
                             break;
diff --git a/core/src/main/java/org/jruby/lexer/yacc/HeredocTerm.java b/core/src/main/java/org/jruby/lexer/yacc/HeredocTerm.java
@@ -126,7 +126,7 @@ public int parseString(RubyLexer lexer) throws java.io.IOException {
                         case '\n':
                             pend--;
                             if (pend == p || lexer.p(pend - 1) == '\r') {
-                                pend++;
+                                pend--;
                                 break;
                             }
                             break;

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public int parseString(RubyLexer lexer, LexerSource src) throws java.io.IOExcept`
`143`	`143`	`case '\n':`
`144`	`144`	`pend--;`
`145`	`145`	`if (pend == p \|\| lexer.p(pend-1) == '\r') {`
`146`		`- pend++;`
	`146`	`+ pend--;`
`147`	`147`	`break;`
`148`	`148`	`}`
`149`	`149`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public int parseString(RubyLexer lexer) throws java.io.IOException {`
`126`	`126`	`case '\n':`
`127`	`127`	`pend--;`
`128`	`128`	`if (pend == p \|\| lexer.p(pend - 1) == '\r') {`
`129`		`- pend++;`
	`129`	`+ pend--;`
`130`	`130`	`break;`
`131`	`131`	`}`
`132`	`132`	`break;`