<table><tr><td style="">mwolff requested changes to this revision.<br />mwolff added a comment.<br />This revision now requires changes to proceed.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D15530">View Revision</a></tr></table><br /><div><div><p>please add tests for the features you add - it's probably enough to add one or two files to <tt style="background: #ebebeb; font-size: 13px;">tests/files/</tt> and use the JSON comments to verify everything is parsed properly?</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D15530#inline-102361">View Inline</a><span style="color: #4b4d51; font-weight: bold;">builder.cpp:1207</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; ">    <span class="n">m_uses</span><span class="p">[</span><span class="n">m_parentContext</span><span style="color: #aa2211">-></span><span class="n">context</span><span class="p">].</span><span class="n">push_back</span><span class="p">(</span><span class="n">cursor</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span style="color: #aa4000">return</span> <span class="n">cursor</span><span class="p">.</span><span class="n">kind</span> <span style="color: #aa2211">==</span> <span class="n">CXCursor_DeclRefExpr</span> <span style="color: #aa2211">||</span> <span class="n">cursor</span><span class="p">.</span><span class="n">kind</span> <span style="color: #aa2211">==</span> <span class="n">CXCursor_MemberRefExpr</span> <span style="color: #aa2211">?</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span style="color: #aa4000">return</span> <span class="n">cursor</span><span class="p">.</span><span class="n">kind</span> <span style="color: #aa2211">==</span> <span class="n">CXCursor_DeclRefExpr</span> <span style="color: #aa2211">||</span> <span class="n">cursor</span><span class="p">.</span><span class="n">kind</span> <span style="color: #aa2211">==</span> <span class="n">CXCursor_MemberRefExpr</span> <span class="bright"></span><span style="color: #aa2211"><span class="bright">||</span></span><span class="bright"> </span><span class="n"><span class="bright">cursor</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">kind</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">==</span></span><span class="bright"> </span><span class="n"><span class="bright">CXCursor_ObjCMessageExpr</span></span><span style="color: #aa2211">?</span>
</div><div style="padding: 0 8px; margin: 0 4px; ">        <span style="color: #a0a000">CXChildVisit_Recurse</span> <span class="p">:</span> <span class="n">CXChildVisit_Continue</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">space before ?</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D15530#inline-102362">View Inline</a><span style="color: #4b4d51; font-weight: bold;">cursorkindtraits.h:62</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #74777d">// kinds from the isClass function above?!)</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #74777d">// TODO: remove this comment.</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span class="n">constexpr</span> <span style="color: #aa4000">bool</span> <span style="color: #004012">isClassNoObjC</span><span class="p">(</span><span class="n">CXCursorKind</span> <span class="n">CK</span><span class="p">)</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">so can this be removed? if not, what compile errors do you get?</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D15530#inline-102363">View Inline</a><span style="color: #4b4d51; font-weight: bold;">parsesession.cpp:94</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; ">    <span class="n">QMimeDatabase</span> <span class="n">db</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span class="bright"></span><span style="color: #aa4000"><span class="bright">if</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="n">db</span><span class="p">.</span><span class="n">mimeTypeForFile</span><span class="p">(</span><span class="n">path</span><span class="p">).</span><span class="n">name</span><span class="p">()<span class="bright"></span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">==</span></span><span class="bright"> </span><span class="n"><span class="bright">QStringLiteral</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">"text/x-objcsrc"</span></span><span class="bright"></span><span class="p"><span class="bright">))</span></span><span class="bright"> </span><span class="p"><span class="bright">{</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">        <span style="color: #aa4000">return</span> <span class="p">{</span><span class="n">QByteArrayLiteral</span><span class="p">(</span><span style="color: #766510">"-xobjective-c++"</span><span class="p">)};</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span class="p">}</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="bright"></span><span class="n"><span class="bright">QString</span></span><span class="bright"> </span><span class="n"><span class="bright">mimeType</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">=</span></span><span class="bright"> </span><span class="n">db</span><span class="p">.</span><span class="n">mimeTypeForFile</span><span class="p">(</span><span class="n">path</span><span class="p">).</span><span class="n">name</span><span class="p">()<span class="bright">;</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; ">    <span style="color: #74777d">// TODO: No proper mime type detection possible yet</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;"><tt style="background: #ebebeb; font-size: 13px;">const auto mimeType = ...</tt><br />
and then move down to where this is actually used</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D15530#inline-102366">View Inline</a><span style="color: #4b4d51; font-weight: bold;">parsesession.cpp:113</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; ">        <span class="n">defaultArguments</span><span class="p">.</span><span class="n">append</span><span class="p">(</span><span class="n">QByteArrayLiteral</span><span class="p">(</span><span style="color: #766510">"-nostdinc++"</span><span class="p">));</span>
</div><div style="padding: 0 8px; margin: 0 4px; ">        <span class="n">defaultArguments</span><span class="p">.</span><span class="n">append</span><span class="p">(</span><span class="n">QByteArrayLiteral</span><span class="p">(</span><span style="color: #766510">"-xc++"</span><span class="p">));</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">by moving down the check you break this path, but apparently that will only show up in unit tests</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D15530#inline-102365">View Inline</a><span style="color: #4b4d51; font-weight: bold;">parsesession.cpp:132</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);">    <span class="bright"></span><span class="n"><span class="bright">result</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">append</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">parserSettings</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">isCpp</span></span><span class="bright"></span><span class="p"><span class="bright">()</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">?</span></span><span class="bright"> </span><span class="n"><span class="bright">QByteArray</span>Literal</span><span class="p">(</span><span style="color: #766510">"<span class="bright">-xc++"</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">:</span></span><span class="bright"> </span><span class="n"><span class="bright">QByteArrayLiteral</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span style="color: #766510"><span class="bright">"-x</span>c"</span><span class="p">))<span class="bright">;</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">    <span class="bright"></span><span style="color: #aa4000"><span class="bright">if</span></span><span class="bright"> </span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">mimeType</span></span><span class="bright"> </span><span style="color: #aa2211"><span class="bright">==</span></span><span class="bright"> </span><span class="n"><span class="bright">QString</span>Literal</span><span class="p">(</span><span style="color: #766510">"<span class="bright">text/x-objc++sr</span>c"</span><span class="p">))<span class="bright"></span></span><span class="bright"> </span><span class="p"><span class="bright">{</span></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span class="n">result</span><span class="p">.</span><span class="n">append</span><span class="p">(</span><span class="n">QByteArrayLiteral</span><span class="p">(</span><span style="color: #766510">"-xobjective-c++"</span><span class="p">));</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">... but do we really want to move these checks down here? is it OK to pass the -nostdinc command e.g. for objc?</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D15530#inline-102367">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kdevclang.xml:67</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span style="color: #00702a"><comment></span>Objective-C++ source code<span style="color: #00702a"></comment></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span style="color: #00702a"><comment</span> <span style="color: #354bb3">xml:lang=</span><span style="color: #766510">"ar"</span><span style="color: #00702a">></span>شفرة مصدر الهدف-C<span style="color: #00702a"></comment></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);">        <span style="color: #00702a"><comment</span> <span style="color: #354bb3">xml:lang=</span><span style="color: #766510">"ast"</span><span style="color: #00702a">></span>códigu fonte en Objective-C++<span style="color: #00702a"></comment></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">remove all the translations, the KDE translation team will handle this</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R32 KDevelop</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D15530">https://phabricator.kde.org/D15530</a></div></div><br /><div><strong>To: </strong>rjvbb, KDevelop, mwolff<br /><strong>Cc: </strong>mwolff, aaronpuchert, kossebau, kdevelop-devel, glebaccon, hase, antismap, iodelay, geetamc, Pilzschaf, akshaydeo, surgenight, arrowd<br /></div>