Perlito5 - string parser flags \E \L \U \Q (more)

Author: fglock

TODO-perlito5

@@ -373,6 +373,10 @@ TODO list for Perlito5
     exists 1
     exists 1
 
+-- delete() in src5/lib/Perlito5/Grammar/String.pm doesn't seem to work:
+    delete($quote_flags->{$flag_to_reset});
+    delete($quote_flags->{last_flag});
+
 -- "or" has SCALAR context (Abigail++):
     See: t5/01-perlito/23-eval.t
 

html/perlito5.js

@@ -6511,12 +6511,37 @@ return (p5call(p5pkg["Perlito5::AST::Val::Buf"], "new", ['buf', p5pkg["Perlito5:
 						else if ( (p5str(v_c) == String.fromCharCode(92)) ) {
 							if ( p5bool(v_interpolate) ) {
 								if ( (p5str(v_c2) == 'E') ) {
-									v_quote_flags = ((new p5HashRef({})));
+									(function () {
+										var v_flag_to_reset;
+										v_flag_to_reset = ((v_quote_flags || (v_quote_flags = new p5HashRef({})))._hash_.p5hget('last_flag'));
+										if ( p5bool(v_flag_to_reset) ) {
+											(v_quote_flags || (v_quote_flags = new p5HashRef({})))._hash_.p5hset(p5str(v_flag_to_reset), (0));
+											(v_quote_flags || (v_quote_flags = new p5HashRef({})))._hash_.p5hset('last_flag', (0));
+										}
+										else {
+											v_quote_flags = ((new p5HashRef({})));
+										};
+										(v_p = ((p5num(v_p) + 1)));
+										v_c = ('');
+									})();
+								}
+								else if ( (p5str(v_c2) == 'L') ) {
+									(v_quote_flags || (v_quote_flags = new p5HashRef({})))._hash_.p5hset(p5str(v_c2), (1));
+									(delete (v_quote_flags || (v_quote_flags = new p5HashRef({})))._hash_.p5hget('U'));
+									(v_quote_flags || (v_quote_flags = new p5HashRef({})))._hash_.p5hset('last_flag', (v_c2));
+									(v_p = ((p5num(v_p) + 1)));
+									v_c = ('');
+								}
+								else if ( (p5str(v_c2) == 'U') ) {
+									(v_quote_flags || (v_quote_flags = new p5HashRef({})))._hash_.p5hset(p5str(v_c2), (1));
+									(delete (v_quote_flags || (v_quote_flags = new p5HashRef({})))._hash_.p5hget('L'));
+									(v_quote_flags || (v_quote_flags = new p5HashRef({})))._hash_.p5hset('last_flag', (v_c2));
 									(v_p = ((p5num(v_p) + 1)));
 									v_c = ('');
 								}
-								else if ( (((p5str(v_c2) == 'L') || (p5str(v_c2) == 'U')) || (p5str(v_c2) == 'Q')) ) {
+								else if ( (p5str(v_c2) == 'Q') ) {
 									(v_quote_flags || (v_quote_flags = new p5HashRef({})))._hash_.p5hset(p5str(v_c2), (1));
+									(v_quote_flags || (v_quote_flags = new p5HashRef({})))._hash_.p5hset('last_flag', (v_c2));
 									(v_p = ((p5num(v_p) + 1)));
 									v_c = ('');
 								};

perlito5.pl

@@ -4489,12 +4489,34 @@ sub Perlito5::Grammar::String::string_interpolation_parse {
         elsif ($c eq chr(92)) {
             if ($interpolate) {
                 if ($c2 eq 'E') {
-                    $quote_flags = {};
+                    my $flag_to_reset = $quote_flags->{'last_flag'};
+                    if ($flag_to_reset) {
+                        $quote_flags->{$flag_to_reset} = 0;
+                        $quote_flags->{'last_flag'} = 0
+                    }
+                    else {
+                        $quote_flags = {}
+                    }
+                    $p += 1;
+                    $c = ''
+                }
+                elsif ($c2 eq 'L') {
+                    $quote_flags->{$c2} = 1;
+                    delete($quote_flags->{'U'});
+                    $quote_flags->{'last_flag'} = $c2;
+                    $p += 1;
+                    $c = ''
+                }
+                elsif ($c2 eq 'U') {
+                    $quote_flags->{$c2} = 1;
+                    delete($quote_flags->{'L'});
+                    $quote_flags->{'last_flag'} = $c2;
                     $p += 1;
                     $c = ''
                 }
-                elsif ($c2 eq 'L' || $c2 eq 'U' || $c2 eq 'Q') {
+                elsif ($c2 eq 'Q') {
                     $quote_flags->{$c2} = 1;
+                    $quote_flags->{'last_flag'} = $c2;
                     $p += 1;
                     $c = ''
                 }

src5/lib/Perlito5/Grammar/String.pm

@@ -384,16 +384,40 @@ sub string_interpolation_parse {
         }
         elsif ($c eq '\\') {
             if ($interpolate) {
-                if ( $c2 eq 'E' ) {
-                    $quote_flags = {};  # reset all $quote_flags
+                # \L \U \Q .. \E - lowercase/uppercase/quotemeta until /E or end-of-string
+                if ($c2 eq 'E') {
+                    my $flag_to_reset = $quote_flags->{last_flag};
+                    if ($flag_to_reset) {
+                        # delete($quote_flags->{$flag_to_reset});
+                        # delete($quote_flags->{last_flag});
+                        $quote_flags->{$flag_to_reset} = 0;
+                        $quote_flags->{last_flag} = 0;
+                    }
+                    else {
+                        $quote_flags = {}
+                    }
+                    $p += 1;
+                    $c = ''
+                }
+                elsif ($c2 eq 'L') {
+                    $quote_flags->{$c2} = 1;
+                    delete $quote_flags->{U};
+                    $quote_flags->{last_flag} = $c2;
+                    $p += 1;
+                    $c = ''
+                }
+                elsif ($c2 eq 'U') {
+                    $quote_flags->{$c2} = 1;
+                    delete $quote_flags->{L};
+                    $quote_flags->{last_flag} = $c2;
                     $p += 1;
-                    $c = '';
+                    $c = ''
                 }
-                elsif ( $c2 eq 'L' || $c2 eq 'U' || $c2 eq 'Q' ) {
-                    # \L \U \Q .. \E - lowercase/uppercase/quotemeta until /E or end-of-string
+                elsif ($c2 eq 'Q') {
                     $quote_flags->{$c2} = 1;
+                    $quote_flags->{last_flag} = $c2;
                     $p += 1;
-                    $c = '';
+                    $c = ''
                 }
             }
             if ($c) {