From 2bd4562f5282b7735916c070b431bc11888a92fb Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Thu, 1 Sep 2016 10:03:43 +0200 Subject: [PATCH] remove detection of contiguous asterisks not required since lexer change of version 2 update 3 --- src/ce_dlangutils.pas | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ce_dlangutils.pas b/src/ce_dlangutils.pas index 3ee3d8ff..2837ee76 100644 --- a/src/ce_dlangutils.pas +++ b/src/ce_dlangutils.pas @@ -103,7 +103,8 @@ function isOperator2(const s: string): boolean; {$IFNDEF DEBUG}inline;{$ENDIF} begin result := false; case s[1] of - '.': result := (s[2] = '.'); + '.': result := s[2] = '.'; + '*': result := s[2] = '='; '>': result := s[2] in ['>', '=']; '<': result := s[2] in ['<', '=', '>']; @@ -113,7 +114,6 @@ begin '+': result := s[2] in ['+', '=']; '-': result := s[2] in ['-', '=']; '/': result := s[2] in ['=']; - '*': result := s[2] in ['=', '*']; // **: pointers '%': result := s[2] in ['=']; '~': result := s[2] in ['=']; @@ -134,13 +134,12 @@ begin or (s[2] = '>') and (s[3] = '='); '!': result := ((s[2] = '<') and (s[3] in ['>', '='])) or ((s[2] = '>')and (s[3] = '=')); - '*': result := (s[2] = '*') and (s[3] = '*'); // ***: pointers end; end; function isOperator4(const s: string): boolean; {$IFNDEF DEBUG} inline; {$ENDIF} begin - result := (s = '>>>=') or (s = '!<>=') or (s = '****'); + result := (s = '>>>=') or (s = '!<>='); end; function isStringPostfix(const c: char): boolean; {$IFNDEF DEBUG}inline;{$ENDIF}