Merge pull request #4427 from raydiak/master

Revert "Revert "Restore Pod6 E<> html entity support (#4397)""
rakudo · Jun 23, 2021 · ad94ef1 · ad94ef1
2 parents 2a13c31 + af50f62
commit ad94ef1
Show file tree

Hide file tree

Showing 2 changed files with 266 additions and 3 deletions.
diff --git a/src/Perl6/Actions.nqp b/src/Perl6/Actions.nqp
@@ -10690,11 +10690,16 @@ class Perl6::Actions is HLL::Actions does STDActions {
             my @meta    := [];
             for $/[0] {
                 if $_<html_ref> {
+#?if !jvm
+                    my $s := Perl6::Pod::str_from_entity(~$_);
+                    $s ?? @contents.push($s) && @meta.push($*W.add_string_constant(~$_).compile_time_value)
+                       !! $/.worry("\"$_\" is not a valid HTML5 entity.");
+#?endif
+#?if jvm
+                    # Java 64K method limit can't compile Perl6::Pod::str_from_entity
                     @contents.push(~$_);
                     @meta.push($*W.add_string_constant(~$_).compile_time_value);
-                    #my $s := Perl6::Pod::str_from_entity(~$_);
-                    #$s ?? @contents.push($s) && @meta.push(~$_)
-                    #   !! $/.worry("\"$_\" is not a valid HTML5 entity.");
+#?endif
                 } else {
                     my $n := $_<integer>
                           ?? $_<integer>.made