fcl-passrc: delphi multiline strings as separate TPasExprKind pekStringMultiLine

packages/fcl-passrc/src/pasresolveeval.pas

@@ -760,6 +760,7 @@ type
     function EvalSetExpr(Expr: TPasExpr; ExprArray: TPasExprArray; Flags: TResEvalFlags): TResEvalSet;
     function EvalArrayValuesExpr(Expr: TArrayValues; Flags: TResEvalFlags): TResEvalSet;
     function EvalPrimitiveExprString(Expr: TPrimitiveExpr): TResEvalValue; virtual;
+    function EvalPrimitiveExprStringMultiLine(Expr: TPrimitiveExpr): TResEvalValue; virtual;
     procedure PredBool(Value: TResEvalBool; ErrorEl: TPasElement);
     procedure SuccBool(Value: TResEvalBool; ErrorEl: TPasElement);
     procedure PredInt(Value: TResEvalInt; ErrorEl: TPasElement);
@@ -4508,66 +4509,77 @@ begin
   {$else}
   Value:=TResEvalUTF16.Create;
   {$endif}
-  p:=1;
-  //writeln('TResExprEvaluator.EvalPrimitiveExprString ',GetObjPath(Expr),' ',Expr.SourceFilename,' ',Expr.SourceLinenumber div 2048,' S=[',S,']');
-  while p<=l do
-    case S[p] of
-    {$ifdef UsePChar}
-    #0: break;
-    {$endif}
-    '''':
-      begin
-      inc(p);
-      StartP:=p;
-      repeat
+  try
+    p:=1;
+    //writeln('TResExprEvaluator.EvalPrimitiveExprString ',GetObjPath(Expr),' ',Expr.SourceFilename,' ',Expr.SourceLinenumber div 2048,' S=[',S,']');
+    while p<=l do
+      case S[p] of
+      {$ifdef UsePChar}
+      #0: break;
+      {$endif}
+      '''':
+        begin
+        inc(p);
+        StartP:=p;
+        repeat
+          if p>l then
+            RaiseInternalError(20170523113938);
+          c:=S[p];
+          case c of
+          '''':
+            begin
+            if p>StartP then
+              AddSrc(copy(S,StartP,p-StartP));
+            inc(p);
+            StartP:=p;
+            if (p>l) or (S[p]<>'''') then
+              break;
+            AddSrc('''');
+            inc(p);
+            StartP:=p;
+            end;
+          else
+            inc(p);
+          end;
+        until false;
+        if p>StartP then
+          AddSrc(copy(S,StartP,p-StartP));
+        end;
+      '#':
+        p:=ReadHash(S,p,l);
+      '^':
+        begin
+        // ^A is #1
+        inc(p);
         if p>l then
-          RaiseInternalError(20170523113938);
+          RaiseInternalError(20181016121520);
         c:=S[p];
         case c of
-        '''':
-          begin
-          if p>StartP then
-            AddSrc(copy(S,StartP,p-StartP));
-          inc(p);
-          StartP:=p;
-          if (p>l) or (S[p]<>'''') then
-            break;
-          AddSrc('''');
-          inc(p);
-          StartP:=p;
-          end;
-        else
-          inc(p);
+        'a'..'z': AddHash(ord(c)-ord('a')+1);
+        'A'..'Z': AddHash(ord(c)-ord('A')+1);
+        else RaiseInternalError(20170523123809);
         end;
-      until false;
-      if p>StartP then
-        AddSrc(copy(S,StartP,p-StartP));
-      end;
-    '#':
-      p:=ReadHash(S,p,l);
-    '^':
-      begin
-      // ^A is #1
-      inc(p);
-      if p>l then
-        RaiseInternalError(20181016121520);
-      c:=S[p];
-      case c of
-      'a'..'z': AddHash(ord(c)-ord('a')+1);
-      'A'..'Z': AddHash(ord(c)-ord('A')+1);
-      else RaiseInternalError(20170523123809);
-      end;
-      inc(p);
+        inc(p);
+        end;
+      else
+        RaiseNotYetImplemented(20170523123815,Expr,'ord='+IntToStr(ord(S[p])));
       end;
-    else
-      RaiseNotYetImplemented(20170523123815,Expr,'ord='+IntToStr(ord(S[p])));
-    end;
-  Result:=Value;
+    Result:=Value;
+    Value:=nil;
+  finally
+    Value.Free;
+  end;
   {$IFDEF VerbosePasResEval}
   //writeln('TResExprEvaluator.EvalPrimitiveExprString Result=',Result.AsString);
   {$ENDIF}
 end;
 
+function TResExprEvaluator.EvalPrimitiveExprStringMultiLine(Expr: TPrimitiveExpr
+  ): TResEvalValue;
+begin
+  Result:=TResEvalUTF16.CreateValue(GetUnicodeStr(Expr.Value,Expr));
+end;
+
 function TResExprEvaluator.CreateResEvalInt(UInt: TMaxPrecUInt): TResEvalValue;
 begin
   if UInt<=HighIntAsUInt then
@@ -4673,6 +4685,11 @@ begin
         Result:=EvalPrimitiveExprString(TPrimitiveExpr(Expr));
         exit;
         end;
+      pekStringMultiLine:
+        begin
+        Result:=EvalPrimitiveExprStringMultiLine(TPrimitiveExpr(Expr));
+        exit;
+        end;
     else
       RaiseNotYetImplemented(20170518200951,Expr);
     end;

packages/fcl-passrc/src/pasresolver.pp

@@ -10213,7 +10213,7 @@ begin
     case Primitive.Kind of
     pekIdent: ResolveNameExpr(El,Primitive.Value,Access);
     pekNumber: ;
-    pekString: ;
+    pekString,pekStringMultiLine: ;
     pekNil,pekBoolConst: ;
     else
       RaiseNotYetImplemented(20160922163451,El);
@@ -28016,6 +28016,15 @@ begin
                                FBaseTypes[btString],FBaseTypes[btString],
                                TPrimitiveExpr(El),[rrfReadable]);
         end;
+      pekStringMultiLine:
+        begin
+        {$IFDEF VerbosePasResolver}
+        writeln('TPasResolver.ComputeElement pekStringMultiLine Value="',LeftStr(TPrimitiveExpr(El).Value,1,500),'"');
+        {$ENDIF}
+        SetResolverValueExpr(ResolvedEl,btString,
+                             FBaseTypes[btString],FBaseTypes[btString],
+                             TPrimitiveExpr(El),[rrfReadable]);
+        end;
       pekNil:
         SetResolverValueExpr(ResolvedEl,btNil,FBaseTypes[btNil],FBaseTypes[btNil],
                              TPrimitiveExpr(El),[rrfReadable]);
@@ -28458,7 +28467,7 @@ begin
   Expr:=ResolvedEl.ExprEl;
   if Expr<>nil then
     begin
-    if Expr.Kind in [pekNumber,pekString,pekNil,pekBoolConst] then
+    if Expr.Kind in [pekNumber,pekString,pekStringMultiLine,pekNil,pekBoolConst] then
       exit(true)
     else
       exit(false);

packages/fcl-passrc/src/pastree.pp

@@ -193,7 +193,8 @@ type
     {$endif}
   end;
 
-  TPasExprKind = (pekIdent, pekNumber, pekString, pekSet, pekNil, pekBoolConst,
+  TPasExprKind = (pekIdent, pekNumber, pekString, pekStringMultiLine, pekSet,
+     pekNil, pekBoolConst,
      pekRange, pekUnary, pekBinary, pekFuncParams, pekArrayParams, pekListOfExp,
      pekInherited, pekSelf, pekSpecialize, pekProcedure);
 
@@ -1754,7 +1755,8 @@ const
   ExprKindNames : Array[TPasExprKind] of TPasTreeString = (
       'Ident',
       'Number',
-      'TPasTreeString',
+      'String',
+      'StringMultiLine',
       'Set',
       'Nil',
       'BoolConst',

packages/fcl-passrc/src/pparser.pp

@@ -1284,7 +1284,7 @@ end;
 function TPasParser.CurTokenText: String;
 begin
   case CurToken of
-    tkIdentifier, tkString, tkNumber, tkChar:
+    tkIdentifier, tkString, tkStringMultiLine, tkNumber, tkChar:
       Result := FCurTokenString;
     else
       Result := TokenInfos[CurToken];
@@ -1707,7 +1707,7 @@ begin
       if (h=hDeprecated) then
         begin
         NextToken;
-        if (Curtoken<>tkString) then
+        if (CurToken<>tkString) then
           UnGetToken
         else if assigned(Element) then
           Element.HintMessage:=CurTokenString;
@@ -2647,8 +2647,9 @@ begin
   CanSpecialize:=aCannot;
   aName:='';
   case CurToken of
+    tkChar:   Last:=CreatePrimitiveExpr(AParent,pekString,CurTokenString);
     tkString: Last:=CreatePrimitiveExpr(AParent,pekString,CurTokenString);
-    tkChar:   Last:=CreatePrimitiveExpr(AParent,pekString,CurTokenText);
+    tkStringMultiLine: Last:=CreatePrimitiveExpr(AParent,pekStringMultiLine,CurTokenString);
     tkNumber: Last:=CreatePrimitiveExpr(AParent,pekNumber,CurTokenString);
     tkIdentifier:
       begin

packages/fcl-passrc/src/pscanner.pp

@@ -85,6 +85,7 @@ const
   nErrInvalidMultiLineLineEnding = 1035;
   nWarnIgnoringLinkLib = 1036;
   nErrInvalidIndent = 1037;
+  nErrMultilineNonWhiteSpaceBeforeClosing = 1038;
 
 // resourcestring patterns of messages
 resourcestring
@@ -127,6 +128,7 @@ resourcestring
   SErrInvalidMultiLineLineEnding = 'Invalid multilinestring line ending type: use one of CR/LF/CRLF/SOURCE/PLATFORM' ;
   SWarnIgnoringLinkLib = 'Ignoring LINKLIB directive %s -> %s (Options: %s)';
   SErrInvalidIndent = ' Inconsistent indent characters';
+  SErrMultilineNonWhiteSpaceBeforeClosing = 'There should be no white-space characters before closing quotes of the text block';
 
 type
   {$IFDEF PAS2JS}
@@ -164,7 +166,8 @@ type
     tkWhitespace,
     tkComment,
     tkIdentifier,
-    tkString,
+    tkString, // string literal including quotes, e.g. 'a'#13^M''''
+    tkStringMultiLine, // string literal in raw format
     tkNumber,
     tkChar, // ^A .. ^Z
     // Simple (one-character) tokens
@@ -908,7 +911,7 @@ type
     procedure PopStackItem; virtual;
     function DoFetchTextToken: TToken; // including quotes
     function DoFetchMultilineTextToken: TToken; // back ticks are converted to apostrophs, unindented
-    function DoFetchDelphiMultiLineTextToken(quotelen: Integer): TToken;
+    function DoFetchDelphiMultiLineTextToken(QuoteLen: Integer): TToken;
     function DoFetchToken: TToken;
     procedure ClearFiles;
     Procedure ClearMacros;
@@ -1012,7 +1015,8 @@ const
     'Whitespace',
     'Comment',
     'Identifier',
-    'TPasScannerString',
+    'String',
+    'StringMultiLine',
     'Number',
     'Character',
     '(',
@@ -4145,18 +4149,15 @@ begin
   until false;
 end;
 
-function TPascalScanner.DoFetchDelphiMultiLineTextToken(quotelen : Integer): TToken;
+function TPascalScanner.DoFetchDelphiMultiLineTextToken(QuoteLen : Integer): TToken;
 // works similar to DoFetchTextToken, except changes indentation
 
 var
-  TokenStart: {$ifdef UsePChar}PAnsiChar{$else}integer{$endif};
-  {$ifndef UsePChar}
   s: TPasScannerString;
-  l: integer;
-  {$endif}
   CurLF : TPasScannerString;
   Lines : Array of String;
-  I,SpaceCount,QuoteCount,WhiteSpaces,CurLines : Integer;
+  l, I, SpaceCount, QuoteCount, WhiteSpaces, CurLineCount , Cnt: Integer;
+  HasNonWhiteSpace: Boolean;
 
   Procedure AddToLines;
 
@@ -4165,10 +4166,10 @@ var
 
   begin
     L:=Length(Lines);
-    if CurLines=L then
-      SetLength(Lines,L+10);
-    Lines[CurLines]:=FCurLine;
-    Inc(CurLines);
+    if CurLineCount=L then
+      SetLength(Lines,L*2+10);
+    Lines[CurLineCount]:=FCurLine;
+    Inc(CurLineCount);
   end;
 
   Function LocalFetchLine : Boolean;
@@ -4185,12 +4186,11 @@ var
     s:=FCurLine;
     l:=length(s);
     {$ENDIF}
-    TokenStart:=FTokenPos;
   end;
 
 begin
   Lines:=[];
-  CurLines:=0;
+  CurLineCount:=0;
   Result:=tkEOF;
   FCurTokenString := '';
   // On entry, we know that the current position is the start of the multiline quoted string.
@@ -4200,7 +4200,7 @@ begin
     WhiteSpaces:=0;
     if not LocalFetchLine then
       exit(tkEOF);
-    // Skip whitespace, but count.
+    // Skip whitespace, but count, as the last line defines the unindented WhiteSpaces.
     {$IFDEF USEPCHAR}
     While (FTokenPos[0]=' ') do
     {$ELSE}
@@ -4210,49 +4210,95 @@ begin
       Inc(FTokenPos);
       Inc(WhiteSpaces);
       end;
-    // Count quotes
-    {$IFDEF USEPCHAR}
-    While (FTokenPos[0]=SingleQuote) and (QuoteCount<QuoteLen) do
-    {$ELSE}
-    While  (QuoteCount<QuoteLen) and (FTokenPos<=l) and (s[FTokenPos]=SingleQuote) do
-    {$ENDIF}
-      begin
-      Inc(FTokenPos);
-      Inc(QuoteCount);
+    // check for the end sequence of quotes
+    HasNonWhiteSpace:=false;
+    repeat
+      {$IFDEF USEPCHAR}
+      case FTokenPos[0] of
+      #0:
+        break;
+      {$ELSE}
+      if FTokenPos>l then
+        break;
+      case s[FTokenPos] of
+      {$ENDIF}
+      SingleQuote:
+        begin
+          repeat
+            inc(FTokenPos);
+            inc(QuoteCount);
+          {$IFDEF UsePChar}
+          until (FTokenPos[0]<>SingleQuote) or (QuoteCount=QuoteLen);
+          {$ELSE}
+          until (FTokenPos>l) or (s[FTokenPos]<>SingleQuote) or (QuoteCount=QuoteLen);
+          {$ENDIF}
+          if QuoteCount=QuoteLen then
+            begin
+            if HasNonWhiteSpace then
+              Error(nErrMultilineNonWhiteSpaceBeforeClosing,sErrMultilineNonWhiteSpaceBeforeClosing);
+            break;
+            end;
+          HasNonWhiteSpace:=true;
+        end;
+      else
+        HasNonWhiteSpace:=true;
+        inc(FTokenPos);
       end;
-    // End of multiline detected ?
+    until false;
     if QuoteCount<>QuoteLen then
-      AddToLines;
-  Until QuoteCount=QuoteLen;
-  if (QuoteCount=0) then
-    Exit(tkEOF);
-  // Final string Construction
-  FCurTokenString:=SingleQuote;
+      AddToLines // another multiline
+    else
+      break;
+  Until false;
+  // Note: the last line defines the needed whitespaces of all lines
+
   CurLF:=GetMultiLineStringLineEnd(FCurSourceFile);
-  For I:=0 to CurLines-1 do
+
+  // unindent
+  Cnt:=0;
+  For I:=0 to CurLineCount-1 do
     begin
+    // cut whitespaces
+    s:=Lines[I];
+    SpaceCount:=0;
+    l:=length(s);
+    while (SpaceCount<l) and (s[SpaceCount+1]=' ') do
+      inc(SpaceCount);
+    if SpaceCount=l then
+      begin
+      // empty line
+      s:='';
+      end
+    else if SpaceCount<WhiteSpaces then
+      ErrorAt(nErrInvalidIndent,SErrInvalidIndent,CurRow-CurLineCount+I,SpaceCount)
+    else
+      s:=copy(s,WhiteSpaces+1,l);
+    Lines[I]:=s;
     if I>0 then
-      FCurTokenString:=FCurTokenString+CurLf;
-    If Lines[I]<>'' then
+      inc(Cnt,length(CurLF));
+    inc(Cnt,length(s));
+    end;
+
+  // build final string
+  SetLength(FCurTokenString,Cnt);
+  Cnt:=0;
+  For I:=0 to CurLineCount-1 do
+    begin
+    s:=Lines[I];
+    l:=length(s);
+    if l>0 then
       begin
-      {$IFDEF USEPCHAR}
-      TokenStart:=@Lines[I][1];
-      SpaceCount:=0;
-      While (TokenStart[0]=' ') and (SpaceCount<WhiteSpaces) do
-      {$ELSE}
-      While (S[TokenStart]=' ') and (SpaceCount<WhiteSpaces) do
-      {$ENDIF}
-        begin
-        Inc(SpaceCount);
-        Inc(TokenStart);
-        end;
-      if SpaceCount<WhiteSpaces then
-        ErrorAt(nErrInvalidIndent,SErrInvalidIndent,CurRow-CurLines+I,SpaceCount);
-      FCurTokenString:=FCurTokenString+Copy(Lines[i],SpaceCount+1,Length(Lines[i])-SpaceCount);
+      System.Move(s[1],FCurTokenString[Cnt+1],l);
+      inc(Cnt,l);
+      end;
+    if I<CurLineCount-1 then
+      begin
+      l:=length(CurLF);
+      System.Move(CurLF[1],FCurTokenString[Cnt+1],l);
+      inc(Cnt,l);
       end;
     end;
-  FCurTokenString:=FCurTokenString+SingleQuote;
-  Result:=tkString;
+  Result:=tkStringMultiLine;
 end;
 
 procedure TPascalScanner.PushStackItem;

packages/fcl-passrc/tests/tcscanner.pas

@@ -146,8 +146,10 @@ type
     procedure TestDelphiMultiLineTrailingGarbage1;
     procedure TestDelphiMultiLineTrailingGarbage2;
     procedure TestDelphiMultiLineTrailingGarbage3;
+    procedure TestDelphiMultiLineTrailingPlusLit;
     procedure TestDelphiMultiLineEmbeddedQuotes;
     procedure TestDelphiMultiLineInDelphiMode;
+    procedure TestDelphiMultiLineFailNonWhiteSpaceBeforeClosing;
     Procedure TestTextBlockDirective;
     procedure TestNumber;
     procedure TestChar;
@@ -625,10 +627,14 @@ begin
     begin
     tk:=FScanner.FetchToken;
     AssertEquals(Format('Read token %d equals expected token.',[i]),t[i],tk);
-    if tk=tkIdentifier then
-      LastIdentifier:=FScanner.CurtokenString
-    else if tk=tkString then
+    case tk of
+    tkIdentifier:
+      LastIdentifier:=FScanner.CurtokenString;
+    tkString:
       fTestTokenString:=FScanner.CurTokenString;
+    tkStringMultiLine:
+      fTestTokenString:=FScanner.CurTokenString;
+    end;
     end;
   if CheckEOF then
     begin
@@ -923,7 +929,7 @@ end;
 procedure TTestScanner.DoTestDelphiMultiLineString;
 
 begin
-  TestTokens([pscanner.tkWhitespace,pscanner.tkString],FMultiLine);
+  TestTokens([pscanner.tkWhitespace,pscanner.tkStringMultiLine],FMultiLine);
 end;
 
 procedure TTestScanner.DoTestDelphiMultiLine;
@@ -971,7 +977,7 @@ begin
   FMultiLine:=CreateDelphiMultiLine([S1,S2]);
   Scanner.CurrentModeSwitches:=Scanner.CurrentModeSwitches+[msDelphiMultiLineStrings];
   DoTestDelphiMultiLineString;
-  AssertEquals('Correct string',SingleQuote+S1+sLineBreak+S2+SingleQuote,TestTokenString);
+  AssertEquals('Correct string',S1+sLineBreak+S2,TestTokenString);
 end;
 
 procedure TTestScanner.TestDelphiMultiLineSpecial2;
@@ -984,7 +990,7 @@ begin
   FMultiLine:=CreateDelphiMultiLine([S1,S2]);
   Scanner.CurrentModeSwitches:=Scanner.CurrentModeSwitches+[msDelphiMultiLineStrings];
   DoTestDelphiMultiLineString;
-  AssertEquals('Correct string',SingleQuote+S1+sLineBreak+S2+SingleQuote,TestTokenString);
+  AssertEquals('Correct string',S1+sLineBreak+S2,TestTokenString);
 end;
 
 procedure TTestScanner.TestDelphiMultiLineTrailingGarbage1;
@@ -1028,6 +1034,19 @@ begin
   AssertException('Trailing garbage leads to error',EAssertionFailedError,@DoTestDelphiMultiLineString,'"Wrong character, expected lineending." expected: <tkLineEnding> but was: <tkChar>');
 end;
 
+procedure TTestScanner.TestDelphiMultiLineTrailingPlusLit;
+var
+  S1,S2 : String;
+
+begin
+  S1:='Line 1 ';
+  S2:='Line 2';
+  FMultiLine:=CreateDelphiMultiLine([S1,S2],2,'+''abc'';');
+  Scanner.CurrentModeSwitches:=Scanner.CurrentModeSwitches+[msDelphiMultiLineStrings];
+  TestTokens([pscanner.tkWhitespace,pscanner.tkStringMultiLine,pscanner.tkPlus,pscanner.tkString,pscanner.tkSemicolon],FMultiLine);
+  AssertEquals('Correct string','''abc''',TestTokenString);
+end;
+
 procedure TTestScanner.TestDelphiMultiLineEmbeddedQuotes;
 var
   S1,S2,S3 : String;
@@ -1039,22 +1058,32 @@ begin
   FMultiLine:=CreateDelphiMultiLine([S1,S2,S3],2,'',5);
   Scanner.CurrentModeSwitches:=Scanner.CurrentModeSwitches+[msDelphiMultiLineStrings];
   DoTestDelphiMultiLineString;
-  AssertEquals('Correct string',SingleQuote+S1+sLineBreak+S2+sLineBreak+S3+SingleQuote,TestTokenString);
+  AssertEquals('Correct string',S1+sLineBreak+S2+sLineBreak+S3,TestTokenString);
 end;
 
 procedure TTestScanner.TestDelphiMultiLineInDelphiMode;
 
-  var
-    S1,S2 : String;
+var
+  S1,S2 : String;
 
-  begin
-    S1:='Line 1';
-    S2:='Line 2';
-    FMultiLine:='{$mode delphi}'+sLineBreak+CreateDelphiMultiLine([S1,S2]);
-    TestTokens([pscanner.tkComment, pscanner.tkLineEnding,pscanner.tkWhitespace,pscanner.tkString],FMultiLine);
+begin
+  S1:='Line 1';
+  S2:='Line 2';
+  FMultiLine:='{$mode delphi}'+sLineBreak+CreateDelphiMultiLine([S1,S2]);
+  TestTokens([pscanner.tkComment, pscanner.tkLineEnding,pscanner.tkWhitespace,pscanner.tkStringMultiLine],FMultiLine);
 
-    AssertEquals('Correct string',SingleQuote+S1+sLineBreak+S2+SingleQuote,TestTokenString);
+  AssertEquals('Correct string',S1+sLineBreak+S2,TestTokenString);
+end;
 
+procedure TTestScanner.TestDelphiMultiLineFailNonWhiteSpaceBeforeClosing;
+var
+  S1, S2: String;
+begin
+  S1:='Line1';
+  S2:='Line''''''''2';
+  FMultiLine:=CreateDelphiMultiLine([S1,S2],2,'');
+  Scanner.CurrentModeSwitches:=Scanner.CurrentModeSwitches+[msDelphiMultiLineStrings];
+  AssertException('Non Whitespace chars before closing',EScannerError,@DoTestDelphiMultiLineString,'afile.pp(3,10) Error: '+SErrMultilineNonWhiteSpaceBeforeClosing);
 end;
 
 
@@ -1069,7 +1098,7 @@ begin
   FMultiLine:=CreateDelphiMultiLine([S1,S2]);
   Scanner.CurrentModeSwitches:=Scanner.CurrentModeSwitches+[msDelphiMultiLineStrings];
   DoTestDelphiMultiLineString;
-  AssertEquals('Correct string',SingleQuote+S1+sLineBreak+S2+SingleQuote,TestTokenString);
+  AssertEquals('Correct string',S1+sLineBreak+S2,TestTokenString);
 end;
 
 procedure TTestScanner.TestCharString;

packages/pastojs/src/fppas2js.pp

@@ -8815,7 +8815,7 @@ begin
     Case El.Kind of
       pekIdent : Result:=GetPasIdentValueType(El.Name,AContext);
       pekNumber : Result:=jstNumber;
-      pekString : Result:=jstString;
+      pekString,pekStringMultiLine : Result:=jstString;
       pekSet : Result:=jstUNDEFINED;
       pekNil : Result:=jstNull;
       pekBoolConst : Result:=jstBoolean;
@@ -8862,10 +8862,15 @@ begin
     if Expr is TPrimitiveExpr then
       begin
       Prim:=TPrimitiveExpr(Expr);
-      if Prim.Kind=pekString then
-        Result:=Prim.Value
+      case Prim.Kind of
+      pekString:
+        begin
+        Result:=Prim.Value;
+        Result:={$IFDEF pas2js}DeQuoteString{$ELSE}AnsiDequotedStr{$ENDIF}(Result,'''');
+        end;
       else
         RaiseNotSupported(Prim,AContext,20170215124733);
+      end;
       end
     else
       RaiseNotSupported(Expr,AContext,20170322121331);
@@ -10347,6 +10352,11 @@ begin
         end;
       //writeln('TPasToJSConverter.ConvertPrimitiveExpression Result="',TJSLiteral(Result).Value.AsString,'" ',GetObjName(AContext.Resolver));
       end;
+    pekStringMultiLine:
+      begin
+      Result:=CreateLiteralJSString(El,StrToJSString(El.Value));
+      //writeln('TPasToJSConverter.ConvertPrimitiveExpression Result="',TJSLiteral(Result).Value.AsString,'" ',GetObjName(AContext.Resolver));
+      end;
     pekNumber:
       begin
       case El.Value[1] of

packages/pastojs/src/pas2jsfiler.pp

@@ -354,6 +354,7 @@ const
     'Ident',
     'Number',
     'String',
+    'StringMultiLine',
     'Set',
     'Nil',
     'Bool',

packages/pastojs/tests/tcmodules.pas

@@ -534,6 +534,7 @@ type
     Procedure TestRecord_Const;
     Procedure TestRecord_TypecastFail;
     Procedure TestRecord_InFunction;
+    Procedure TestRecord_ArrayConstMultiline;
 
     // anonymous record
     Procedure TestRecordAnonym_Field;
@@ -13166,6 +13167,54 @@ begin
     '']));
 end;
 
+procedure TTestModule.TestRecord_ArrayConstMultiline;
+begin
+  StartProgram(false);
+  Add([
+  '{$mode delphi}',
+  'type',
+  '  TBird = record Wing: string; end;',
+  'const',
+  '  Birds: array[1..2] of TBird = (',
+  '    (Wing: ''''''',
+  '      First',
+  '      Second',
+  '      Third',
+  '    ''''''),',
+  '    (Wing: ''''''',
+  '      Value:=''Im in quotes''; ',
+  '    '''''')',
+  '  );',
+  'begin']);
+  ConvertProgram;
+  CheckSource('TestRecord_ArrayConstMultiline',
+    LinesToStr([ // statements
+    'rtl.recNewT(this, "TBird", function () {',
+    '  this.Wing = "";',
+    '  this.$eq = function (b) {',
+    '    return this.Wing === b.Wing;',
+    '  };',
+    '  this.$assign = function (s) {',
+    '    this.Wing = s.Wing;',
+    '    return this;',
+    '  };',
+    '});',
+    'this.Birds$a$clone = function (a) {',
+    '  var b = [];',
+    '  b.length = 2;',
+    '  for (var c = 0; c < 2; c++) b[c] = $mod.TBird.$clone(a[c]);',
+    '  return b;',
+    '};',
+    'this.Birds = [this.TBird.$clone({',
+    '  Wing: "  First\n  Second\n  Third"',
+    '}), this.TBird.$clone({',
+    '  Wing: "  Value:=''Im in quotes''; "',
+    '})];',
+    '']),
+    LinesToStr([ // $mod.$main
+    '']));
+end;
+
 procedure TTestModule.TestRecordAnonym_Field;
 begin
   StartProgram(false);