Skip to content

Commit fc82393

Browse files
authored
Merge pull request #4212 from masatake/main/read--revise-offset-calculation-in-nested-input-stream
main/read: revise the offset calculation on nested input stream Conceptually this pull request is derrived from #4097. Fixes ths issue reported in #4097. Fixes #4181. Fixes #4141.
2 parents fe86559 + edd51f3 commit fc82393

File tree

72 files changed

+1008
-141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1008
-141
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
JSP tags shouldn't trigger the PHP parser.
2+
3+
This used to happen and trigger an infinite loop of a ping-pong effect
4+
with the HTML parser asking the PHP parser to parse the JSP block, and
5+
the PHP parser, not recognizing the input, asking the HTML one to deal
6+
with it. Rinse and repeat.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--sort=no
2+
--extras='*'
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<%=

Units/parser-html.r/jsp.d/README

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
JSP tags shouldn't trigger the PHP parser.
2+
3+
This used to happen and trigger an infinite loop of a ping-pong effect
4+
with the HTML parser asking the PHP parser to parse the JSP block, and
5+
the PHP parser, not recognizing the input, asking the HTML one to deal
6+
with it. Rinse and repeat.

Units/parser-html.r/jsp.d/args.ctags

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--sort=no
2+
--extras='*'

Units/parser-html.r/jsp.d/input.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<%=
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
About this input input.md /^# About this input$/;" c
22
Python input.md /^title: Python$/;" t
3-
TITLE in region ended with ... input-0.md /^title: TITLE in region ended with ...$/;" t
3+
TITLE in region ended with ... input-0.md /^title: TITLE in region ended with .../;" t
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--extras=+g
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
d input.md /^[d]$/;" t
2+
o input.md /^[o]$/;" t
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
packcc

0 commit comments

Comments
 (0)