diff --git a/components/chelper/cconvlog.pas b/components/chelper/cconvlog.pas
new file mode 100644
index 000000000..5333f3a2d
--- /dev/null
+++ b/components/chelper/cconvlog.pas
@@ -0,0 +1,44 @@
+unit cconvlog;
+
+interface
+
+{$ifdef fpc}{$mode delphi}{$endif}
+
+uses
+  SysUtils;
+
+
+procedure log(const s: string); overload;
+procedure log(const fmt: string; const params: array of const); overload;
+
+var
+  _log : procedure (const s: string) = nil;
+
+procedure _stdOutLog(const s: string);
+procedure _stdErrLog(const s: string);
+
+implementation
+
+procedure _stdErrLog(const s: string);
+begin
+  writeln(StdErr, s);
+end;
+
+procedure _stdOutLog(const s: string);
+begin
+  writeln(s);
+end;
+
+procedure log(const s: string); overload;
+begin
+  if Assigned(_log) then _log(s);
+end;
+
+procedure log(const fmt: string; const params: array of const); overload;
+begin
+  if not assigned(_log) then Exit;
+  if fmt<>'' then Log(Format(fmt, params)) else Log('');
+end;
+
+end.
+
diff --git a/components/chelper/cparserexp.pas b/components/chelper/cparserexp.pas
new file mode 100644
index 000000000..c56aa4f3e
--- /dev/null
+++ b/components/chelper/cparserexp.pas
@@ -0,0 +1,414 @@
+unit cparserexp;
+
+interface
+
+uses
+  cparsertypes;
+
+type
+  TIdentType = (itIdent, itIndex, itFuncCall, itField, itSubSel);
+
+  TExpDir = (edValue, edPrefix, edPostfix, edInfix, edTernary, edSequence);
+
+  TExp = class(TObject)
+    left    : TExp;
+    right   : TExp;
+    main    : TExp;
+    inner   : TExp;
+    pr      : Integer;
+    op      : string;
+    val     : string;
+    dir     : TExpDir;
+    casttype  : string;
+    identtype : TIdentType;
+    constructor Create(apr: Integer; const aop: string =''; adir: TExpDir = edInfix);
+  end;
+
+const
+  CIdentClose : array [TIdentType] of string = ('', ']',')', '', '');
+  CIdentOpen  : array [TIdentType] of string = ('', '[','(', '.', '->');
+
+function ParseCExprEx(p: TTextParser): TExp;
+
+implementation
+
+function Rotate(core: TExp): TExp;
+begin
+  if Assigned(core.right) and (core.right.dir<>edValue) and (core.right.pr>=core.pr) then
+  begin
+    Result:=core.right;
+    core.right:=Result.left;
+    Result.left:=core;
+
+    // additional rotate
+    Result.left:=Rotate(core);
+  end else
+    Result:=core;
+end;
+
+function isIdentSep(const t: string; var it: TIdentType): Boolean;
+begin
+  Result:=true;
+  if t='(' then it:=itFuncCall
+  else if t = '[' then it:=itIndex
+  else if t = '.' then it:=itField
+  else if t = '->' then it:=itSubSel
+  else Result:=false;
+end;
+
+function level2(p: TTextParser; NameOnly: Boolean = false): TExp;
+var
+  exp : TExp;
+  res : Boolean;
+  it  : TIdentType;
+  e   : TExp;
+begin
+  Result:=nil;
+  if p.TokenType=tt_Numeric then begin
+    exp := TExp.Create(2, '', edValue);
+    exp.val:=p.Token;
+    p.NextToken;
+    Result:=exp;
+  end else if p.TokenType=tt_Ident then begin
+    exp := TExp.Create(2, '', edValue);
+    exp.val:=p.Token;
+    p.NextToken;
+    res:=isIdentSep(p.Token, it);
+    if res then begin
+      e:=TExp.Create(2, p.Token, edPostfix);
+      e.left:=exp;
+      exp:=e;
+      p.NextToken;
+      if it in [itField, itSubSel] then
+        exp.right:=level2(p, true)
+      else if it in [itFuncCall, itIndex] then begin
+        //writeln('parsing sub expression ', p.Token);
+        exp.inner:=ParseCExprEx(p);
+        //writeln('res = ', PtrUint(exp.inner));
+        //writeln('p.token =', p.Token);
+        if p.Token = CIdentClose[it] then
+          p.NextToken
+        else begin
+          // error!
+        end;
+      end;
+    end else if (p.Token='++') or (p.Token='--') then begin
+      e:=TExp.Create(2, p.Token, edPostfix);
+      e.left:=exp;
+      exp:=e;
+      p.NextToken;
+    end;
+    Result:=exp;
+  end;
+end;
+
+function level3(p: TTextParser): TExp;
+var
+  exp : TExp;
+  ct  : TExp;
+begin
+  exp:=level2(p);
+  if not Assigned(exp) then begin
+    Result:=nil;
+    // typecast
+    if (p.Tokentype=tt_Symbol) and (p.Token='(') then begin
+      p.NextToken;
+      ct:=TExp.Create(3, '(', edInfix);
+      ct.inner:=ParseCExprEx(p);
+      if (p.TokenType=tt_Symbol) and (p.Token = ')') then
+        p.NextToken;
+      ct.right:=ParseCExprEx(p);
+      Result:=ct;
+      Result:=Rotate(Result);
+    end else if (p.Token='sizeof') or (p.Token='++') or (p.Token='--')
+      or ((length(p.Token) = 1) and (p.Token[1] in ['&','*','~','!','-','+']))
+    then begin
+      Result:=TExp.Create(3, p.Token, edPrefix);
+      p.NextToken;
+      Result.right:=ParseCExprEx(p);
+      Result:=Rotate(Result);
+    end
+  end else
+    Result:=exp;
+end;
+
+function level5(p: TTextParser): TExp;
+var
+  e : TExp;
+begin
+  e:=level3(p);
+  if Assigned(e) then begin
+    if (p.TokenType = tt_Symbol) and ( (length(p.Token)=1) and (p.Token[1] in ['*','/','%'])) then
+    begin
+      Result:=TExp.Create(5, p.Token, edInfix);
+      p.NextToken;
+      Result.left:=e;
+      Result.right:=ParseCExprEx(p);
+      Result:=Rotate(Result);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level6(p: TTextParser): TExp;
+var
+  e : TExp;
+begin
+  e:=level5(p);
+  if Assigned(e) then begin
+    if (p.TokenType = tt_Symbol) and ( (length(p.Token)=1) and (p.Token[1] in ['+','-'])) then
+    begin
+      Result:=TExp.Create(6, p.Token, edInfix);
+      p.NextToken;
+      Result.left:=e;         // a * b + c
+      Result.right:=ParseCExprEx(p);
+      Result:=Rotate(Result);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level7(p: TTextParser): TExp;
+var
+  e : TExp;
+begin
+  e:=level6(p);
+  if Assigned(e) then begin
+    if (p.TokenType = tt_Symbol) and ( (p.Token = '<<') or (p.Token='>>')) then
+    begin
+      Result:=TExp.Create(7, p.Token, edInfix);
+      p.NextToken;
+      Result.left:=e;
+      Result.right:=ParseCExprEx(p);
+      Result:=Rotate(Result);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level8(p: TTextParser): TExp;
+var
+  e : TExp;
+  tk : string;
+begin
+  e:=level7(p);
+  if Assigned(e) then begin
+    tk:=p.Token;
+    if (p.TokenType = tt_Symbol) and ((tk='<') or (tk='<=') or (tk='>=') or (tk='>')) then
+    begin
+      Result:=TExp.Create(8, p.Token, edInfix);
+      p.NextToken;
+      Result.left:=e;
+      Result.right:=ParseCExprEx(p);
+      Result:=Rotate(Result);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level9(p: TTextParser): TExp;
+var
+  e : TExp;
+  tk : string;
+begin
+  e:=level8(p);
+  if Assigned(e) then begin
+    tk:=p.Token;
+    if (p.TokenType = tt_Symbol) and ((tk='==') or (tk='!=')) then
+    begin
+      Result:=TExp.Create(9, p.Token, edInfix);
+      Result.left:=e;
+      p.NextToken;
+      Result.right:=ParseCExprEx(p);
+      Result:=Rotate(Result);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level10(p: TTextParser): TExp;
+var
+  e : TExp;
+  tk : string;
+begin
+  e:=level9(p);
+  if Assigned(e) then begin
+    tk:=p.Token;
+    if (p.TokenType = tt_Symbol) and (tk='&') then
+    begin
+      Result:=TExp.Create(10, p.Token, edInfix);
+      Result.left:=e;
+      p.NextToken;
+      Result.right:=ParseCExprEx(p);
+      Result:=Rotate(Result);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level11(p: TTextParser): TExp;
+var
+  e : TExp;
+  tk : string;
+begin
+  e:=level10(p);
+  if Assigned(e) then begin
+    tk:=p.Token;
+    if (p.TokenType = tt_Symbol) and (tk='^') then
+    begin
+      Result:=TExp.Create(11, p.Token, edInfix);
+      Result.left:=e;
+      p.NextToken;
+      Result.right:=ParseCExprEx(p);
+      Result:=Rotate(Result);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level12(p: TTextParser): TExp;
+var
+  e : TExp;
+  tk : string;
+begin
+  e:=level11(p);
+  if Assigned(e) then begin
+    tk:=p.Token;
+    if (p.TokenType = tt_Symbol) and (tk='|') then
+    begin
+      Result:=TExp.Create(12, p.Token, edInfix);
+      Result.left:=e;
+      p.NextToken;
+      Result.right:=ParseCExprEx(p);
+      Result:=Rotate(Result);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level13(p: TTextParser): TExp;
+var
+  e : TExp;
+  tk : string;
+begin
+  e:=level12(p);
+  if Assigned(e) then begin
+    tk:=p.Token;
+    if (p.TokenType = tt_Symbol) and (tk='&&') then
+    begin
+      Result:=TExp.Create(13, p.Token, edInfix);
+      Result.left:=e;
+      p.NextToken;
+      Result.right:=ParseCExprEx(p);
+      Result:=Rotate(Result);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level14(p: TTextParser): TExp;
+var
+  e : TExp;
+  tk : string;
+begin
+  e:=level13(p);
+  if Assigned(e) then begin
+    tk:=p.Token;
+    if (p.TokenType = tt_Symbol) and (tk='||') then
+    begin
+      Result:=TExp.Create(14, p.Token, edInfix);
+      Result.left:=e;
+      p.NextToken;
+      Result.right:=ParseCExprEx(p);
+      Result:=Rotate(Result);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level15(p: TTextParser): TExp;
+var
+  e   : TExp;
+  tk  : string;
+begin
+  e:=level14(p);
+  if Assigned(e) then begin
+    if p.Token='?' then begin
+      p.NextToken;
+      Result:=TExp.Create(15, '?', edTernary);
+      Result.main:=e;
+      Result.left:=ParseCExprEx(p);
+      if p.Token = ':' then p.NextToken;
+      Result.right:=ParseCExprEx(p);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level16(p: TTextParser): TExp;
+var
+  tk  : string;
+  e   : TExp;
+begin
+  e:=level15(p);
+  if Assigned(e) then begin
+    tk:=p.Token;
+    if (tk='=')
+       or (tk='+=') or (tk='-=') or (tk='*=') or (tk='/=')
+       or (tk='%=') or (tk='<<=') or (tk='>>=') or (tk='&=')
+       or (tk='^=') or (tk='|=') then
+    begin
+      Result:=TExp.Create(16, tk, edInfix);
+      Result.right:=e;
+      p.NextToken;
+      Result.left:=ParseCExprEx(p);
+    end else
+      Result:=e;
+  end else
+    Result:=nil;
+end;
+
+function level17(p: TTextParser): TExp;
+var
+  tk  : string;
+  e   : TExp;
+begin
+  Result:=level16(p);
+  if Assigned(Result) and (p.TokenType=tt_Symbol) and (p.Token=',') then begin
+    e:=Result;
+    p.NextToken;
+    Result:=TExp.Create(17, ',', edSequence);
+    Result.left:=e;
+    Result.right:=ParseCExprEx(p);
+  end;
+end;
+
+function ParseCExprEx(p: TTextParser): TExp;
+begin
+  Result:=level17(p);
+end;
+
+{ TExp }
+
+constructor TExp.Create(apr: Integer; const aop: string; adir: TExpDir = edInfix);
+begin
+  inherited Create;
+  pr:=apr;
+  op:=aop;
+  dir:=adir;
+end;
+
+
+
+end.
diff --git a/components/chelper/cparsertypes.pas b/components/chelper/cparsertypes.pas
index d9052136b..f4266a118 100755
--- a/components/chelper/cparsertypes.pas
+++ b/components/chelper/cparsertypes.pas
@@ -24,7 +24,7 @@ interface
 {$ifdef fpc}{$mode delphi}{$h+}{$endif}
 
 uses
-  Classes, SysUtils, TextParsingUtils;
+  Classes, SysUtils, TextParsingUtils, cconvlog;
 
 const
   Err_Ident   = 'Identifier';
@@ -244,6 +244,7 @@ type
   public
     Tokens  : array of TExpPart;
     Count   : Integer;
+
     procedure PushToken(const AToken: AnsiString; ATokenType: TTokenType);
   end;
 
@@ -293,7 +294,8 @@ var
 function ParseNextCEntity(AParser: TTextParser): TEntity; // default ParseNextEntity
 function ParseCNamePart(Parser: TTextParser): TNamePart;  // default ParseNamePart
 
-function ParseCExpression(AParser: TTextParser; var ExpS: AnsiString): Boolean;
+function ParseCExpression(AParser: TTextParser; var ExpS: AnsiString): Boolean; deprecated;
+function ParseCExpr(Parser: TTextParser; CommaIsEnd: Boolean=False): TExpression;
 procedure ParseCNumeric(const S: AnsiString; var idx: integer; var NumStr: AnsiSTring);
 function ParseCString(const S: AnsiString; var idx: Integer; var CStr: AnsiString): Boolean;
 function ParseCMacroParam(AParser: TTextParser; var ExpS: AnsiString): Boolean;
@@ -619,6 +621,7 @@ begin
   Result:=True;
 end;
 
+
 function ParseCExpression(AParser: TTextParser; var ExpS: AnsiString): Boolean;
 var
   i     : integer;
@@ -736,12 +739,14 @@ begin
 
     Result := Assigned(df);
     if Result then begin
+      log('preprocessor: (%d) %s for "%s"', [idx, df.ClassName, s]);
       Index:=i;
       Result := df.Parse(Self);
       Comments.Add(df);
       if Assigned(OnPrecompile) then OnPrecompile(Self, df);
-    end else
+    end else begin
       SetError('cannot handle preprocessor: "'+s+'"');
+    end;
 
   finally
     ProcessingMacro := false;
@@ -1171,13 +1176,30 @@ begin
     if not Result then Exit;
 
     if s = '"' then exp := '"'
-    else if s = '<' then exp := '>';
+    else if s = '<' then exp := '>'
+    else begin
+      Result:=false;
+      AParser.SetError('" is expected');
+      Exit;
+    end;
+
+    Included:=ScanTo(AParser.Buf, AParser.Index, [exp[1]]+ EoLnChars);
+    if (AParser.Index<=length(AParser.Buf)) and (AParser.Buf[AParser.Index] in EoLnChars) then begin
+      Result:=false;
+      AParser.SetError(exp+' is expected');
+      Exit;
+    end;
+    AParser.FindNextToken(s, tt);
+
+    {repeat
 
-    repeat
       AParser.FindNextToken(s, tt);
       if (s = '/') or (s = '\') or (tt = tt_Ident) then
         Included := Included + s;
-    until (tt =tt_Symbol) and ((s <> '\') or (s <> '/'));
+    until (tt =tt_Symbol) and ((s <> '\') or (s <> '/'));}
+
+    log('file: %s', [included]);
+
     Result := s = exp;
     SkipLine(AParser.buf, AParser.Index);
   finally
@@ -2097,6 +2119,7 @@ begin
   inherited Destroy;
 end;
 
+
 initialization
   ParseNextEntity:=@ParseNextCEntity;
   ParseNamePart:=@ParseCNamePart;
diff --git a/components/chelper/ctopasconvert.pas b/components/chelper/ctopasconvert.pas
index 0401896d1..5bbd42303 100644
--- a/components/chelper/ctopasconvert.pas
+++ b/components/chelper/ctopasconvert.pas
@@ -24,8 +24,8 @@ interface
 
 uses
   Classes, SysUtils,
-  cparsertypes, TextParsingUtils, codewriter, cparserutils,
-  objcparsing;
+  cparsertypes, TextParsingUtils, codewriter, cparserutils
+  ,objcparsing, cconvlog;
 
 var
   DoDebugEntities : Boolean = False; // write parsed entities names if no converter found!?
@@ -446,7 +446,9 @@ var
   c : Integer;
 begin
   c:=GetEmptyLinesCount(t, StartOfs, EndOfs);
-  for i:=1 to c do Result:=Result+LineEnding;
+  Result:='';
+  for i:=1 to c do
+    Result:=Result+LineEnding;
 end;
 
 function ConvertCode(const t: AnsiString; var endPoint: TPoint; AllText: Boolean; var ParseError: TErrorInfo; cfg: TConvertSettings): AnsiString;
@@ -473,7 +475,8 @@ begin
   try
     macros:=TCMacroHandler.Create;
 
-    if cfg.CustomDefines<>'' then PrepareMacros(cfg.CustomDefines, macros);
+    if cfg.CustomDefines<>'' then
+      PrepareMacros(cfg.CustomDefines, macros);
 
     cmt := TStopComment.Create;
     p := CreateCParser(t);
@@ -482,6 +485,7 @@ begin
     p.OnComment:=@cmt.OnComment;
     p.OnPrecompile:=@cmt.OnPrecompiler;
     cmtlist:=TList.Create;
+
     try
       repeat
         try