Skip to content
Snippets Groups Projects
  1. Jul 19, 2012
  2. Jun 25, 2012
    • Leandro Melo's avatar
      C++: Core changes in preprocessing · d6ccffc0
      Leandro Melo authored
      
      Summary of most relevant items:
      
      - Preprocessor output format change. No more gen true/false. Instead
        a more intuitive and natural expansion (like from a real compiler) is
        performed directly corresponding to the macro invocation. Notice that
        information about the generated tokens is not lost, because it's now
        embedded in the expansion section header (in terms of lines and columns
        as explained in the code). In addition the location on where the macro
        expansion happens is also documented for future use.
      
      - Fix line control directives and associated token line numbers.
        This was not detected in tests cases because some of them were
        actually wrong: Within expansions the line information was being
        considered as originally computed in the macro definition, while
        the desired and expected for Creator's reporting mechanism (just
        like regular compilers) is the line from the expanded version
        of the tokens.
      
      - Do not allow for eager expansion. This was previously being done
        inside define directives. However, it's not allowed and might
        lead to incorrect results, since the argument substitution should
        only happen upon the macro invocation (and following nested ones).
        At least GCC and clang are consistent with that. See test case
        tst_Preprocessor:dont_eagerly_expand for a detailed explanation.
      
      - Revive the 'expanded' token flag. This is used to mark every token
        that originates from a macro expansion. Notice, however, that
        expanded tokens are not necessarily generated tokens (although
        every generated token is a expanded token). Expanded tokens that
        are not generated are those which are still considered by our
        code model features, since they are visible on the editor. The
        translation unit is smart enough to calculate line/column position
        for such tokens based on the information from the expansion section
        header.
      
      - How expansions are tracked has also changed. Now, we simply add
        two surrounding marker tokens to each "top-level" expansion
        sequence. There is an enumeration that control expansion states.
        Also, no "previous" token is kept around.
      
      - Preprocessor client methods suffered a change in signature so
        they now receive the line number of the action in question as
        a paramater. Previously such line could be retrieved by the client
        implementation by accessing the environment line. However, this
        is not reliable because we try to avoid synchronization of the
        output/environment lines in order to avoid unnecessary output,
        while expanding macros or handling preprocessor directives.
      
      - Although macros are not expanded during define directives (as
        mentioned above) the preprocessor client is now "notified"
        when it sees a macro. This is to allow usage tracking.
      
      - Other small stuff.
      
      This is all in one patch because the fixes are a consequence
      of the change in preprocessing control.
      
      Change-Id: I8f4c6e6366f37756ec65d0a93b79f72a3ac4ed50
      Reviewed-by: default avatarRoberto Raggi <roberto.raggi@nokia.com>
      d6ccffc0
  3. Jun 19, 2012
  4. Jun 06, 2012
  5. Jun 05, 2012
    • Francois Ferrand's avatar
      CppHighlighter: highlight all functions/methods. · 809611f3
      Francois Ferrand authored
      
      - Highlight all function/methods (not just virtual methods).
      - Highlight as a function even if number of arguments does not match. In
        that case, add a diagnostic message to indicate there are too many/too
        few arguments.
      - Fix highlighting of parameters in function declarations.
        These used to be handled indiferently, and they could be mistaken for
        type or field references.
      - Properly highlight template method calls.
      
      Change-Id: I6e61c9ee47763db95c62314f9cc1c4d398df38b3
      Reviewed-by: default avatarLeandro Melo <leandro.melo@nokia.com>
      809611f3
  6. Jun 01, 2012
    • Leandro Melo's avatar
      C++: Fix macro uses line info · ca7ac8c0
      Leandro Melo authored
      
      Make sure the environment line is consistent during preprocessor
      directives and identifier handling so clients can rely on consistent
      information. Particularly important for macro usages.
      
      New tests also added.
      
      Change-Id: I962a39a86cd17b8d945d2959c2c95e2d258ea3e6
      Reviewed-by: default avatarhjk <qthjk@ovi.com>
      ca7ac8c0
  7. Apr 19, 2012
  8. Mar 30, 2012
  9. Mar 29, 2012
    • Erik Verbruggen's avatar
      Revert "CppHighlighter: highlight all functions/methods." · 210c1912
      Erik Verbruggen authored
      
      This reverts commit e3e67467cfea5934f16a95385761455b0c495a0d
      
      Reason is that it shows errors for calls to function-like macros. For example, any use of Q_DISABLE_COPY results in invalid errors.
      
      Change-Id: I1fd1473ac5a30da5b9aebf6a3f0f11055bdbe8ad
      Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@nokia.com>
      210c1912
    • Francois Ferrand's avatar
      CppHighlighter: highlight all functions/methods. · e639a238
      Francois Ferrand authored
      
      - Highlight all function/methods (not just virtual methods).
      - Highlight as a function even if number of arguments does not match. In
        that case, add a diagnostic message to indicate there are too many/too
        few arguments.
      - Fix highlighting of parameters in function declarations.
        These used to be handled indiferently, and they could be mistaken for
        type or field references.
      - Properly highlight template method calls.
      
      Change-Id: I6ab463996dda47554839f482da47f561f76663a7
      Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@nokia.com>
      e639a238
    • Erik Verbruggen's avatar
      [C++] Rewrite of the preprocessor. · 60db5736
      Erik Verbruggen authored
      
      This rewrite fixes a couple of issues with the pre-processor. It now
      supports:
      - macros in macro bodies
      - stringification of parameters [cpp.stringize]
      - the concatenation operator [cpp.concat]
      - #include MACRO_HERE
      - defined() inside macro bodies used in pp-conditions.
      
      Change-Id: Ifdb78041fb6afadf44f939a4bd66ce2832b8601f
      Reviewed-by: default avatarRoberto Raggi <roberto.raggi@nokia.com>
      60db5736
  10. Mar 28, 2012
  11. Mar 27, 2012
  12. Mar 15, 2012
  13. Mar 14, 2012
  14. Mar 06, 2012
  15. Feb 23, 2012
  16. Feb 21, 2012
  17. Feb 20, 2012
  18. Feb 16, 2012
    • Erik Verbruggen's avatar
      Supply c++11 flags and per-project info to c++ code model. · 3aab8bea
      Erik Verbruggen authored
      
      A manual squash/merge of the changes below, plus a couple of subsequent
      code fixes.
      
      59085aa5fbb99e2d786cd2c1a06c24a111ccb49f:
          Modify CppModel::ProjectInfo
      
          Adding per project node information, to pass on the correct
          defines/includes for each file, instead of aggregating them incorrectly.
      
          Also split up SOURCES and OBJECTIVE_SOURCES.
      
          Also ask the toolchain to convert the compilerflags to flags the
          codemodel understands, for now only gcc and only c++11.
      
          Also make the toolchain aware of the flags used to compile, so that it
          can emit the correct defines.
      
          Note: No header files are passed on.
      
      74028802314cd4e75b41b46407433e07090a304d:
          GCC: Evaluate cxxflags when checking for predefined macros
      
      ebaaa4957e4c02cc9637a998eddae1d0acd74f83:
          MSVC: Take cxxflags into account when checking for predefined macros
      
      9bfce7e889bcf7bcc47bf880e3ea25945ca7d0d7:
          Compile fixes
      
      Change-Id: I9de94ad038dfc5dc1987732e84b13fb4419c96f5
      Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@nokia.com>
      3aab8bea
  19. Feb 15, 2012
  20. Feb 13, 2012
  21. Feb 09, 2012
  22. Feb 08, 2012
  23. Jan 31, 2012
  24. Jan 26, 2012
  25. Jan 24, 2012
  26. Jan 13, 2012
  27. Nov 03, 2011
  28. Oct 26, 2011
  29. Sep 08, 2011
  30. Sep 06, 2011
  31. Aug 31, 2011
  32. Aug 30, 2011
Loading