ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/public/ibx/trunk/runtime/IBSQLParser.pas

Comparing ibx/trunk/runtime/IBSQLParser.pas (file contents):
Revision 21 by tony, Thu Feb 26 10:33:34 2015 UTC vs.
Revision 31 by tony, Tue Jul 14 15:31:25 2015 UTC

#	Line 288 | Line 288 | begin
288		if not (FState in [stInComment,stInCommentLine]) then
289		begin
290		AddToSQL(':');
291	<	SetState(stInParam);
291	>	if not (FState in [stInSingleQuotes,stInDoubleQuotes]) then
292	>	SetState(stInParam);
293		end;
294
295		sqSemiColon:
#	Line 447 | Line 448 | begin
448		FState := PopState;
449		stInDoubleQuotes,
450		stInSingleQuotes:
451	<	raise Exception.Create(sNoEndToThis);
451	>	Begin
452	>	FLiteral := FLiteral + #$0A;
453	>	Exit;
454	>	End;
455		end;
456		AddToSQL(' ');
457		Exit;
#	Line 782 | Line 786 | begin
786		Inc(index)
787		end;
788
789	<	if (Result = sqString)  and not (FState in [stInComment,stInCommentLine])then
789	>	if (Result = sqString)  and not (FState in [stInComment,stInCommentLine, stInSingleQuotes,stInDoubleQuotes])then
790		Result := Check4ReservedWord(FString);
791
792		if (index > Length(Line)) then
793	<	if Result = sqNone then
793	>	begin
794	>	if  (Result = sqNone) then
795		Result := sqEOL
796		else
797		if (FLastSymbol = sqNone) and (Result <> sqEOL) then
798		FLastSymbol := sqEOL;
799	+	end;
800
801		end;
802

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines