1. 11 Jan, 2013 1 commit
  2. 08 Jan, 2013 1 commit
    • Orgad Shaneh's avatar
      Remove braces for single lines of conditions · 29a93998
      Orgad Shaneh authored
      #!/usr/bin/env ruby
      
      Dir.glob('**/*.cpp') { |file|
        # skip ast (excluding paste, astpath, and canv'ast'imer)
        next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
        s = File.read(file)
        next if s.include?('qlalr')
        orig = s.dup
        s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
          res = $&
          if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
            res
          else
            res.gsub!('} else', 'else')
            res.gsub!(/\n +} *\n/m, "\n")
            res.gsub(/ *{$/, '')
          end
        }
        s.gsub!(/ *$/, '')
        File.open(file, 'wb').write(s) if s != orig
      }
      
      Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
      Reviewed-by: default avatarhjk <qthjk@ovi.com>
      29a93998
  3. 04 Jan, 2013 1 commit
  4. 20 Dec, 2012 1 commit
  5. 04 Dec, 2012 1 commit
  6. 03 Dec, 2012 1 commit
  7. 28 Nov, 2012 1 commit
  8. 26 Nov, 2012 1 commit
  9. 22 Nov, 2012 1 commit
  10. 06 Nov, 2012 1 commit
  11. 23 Oct, 2012 1 commit
  12. 16 Oct, 2012 1 commit
  13. 15 Oct, 2012 1 commit
  14. 08 Oct, 2012 1 commit
    • Andre Hartmann's avatar
      Fix encoding of non-opened include files. · 82d312aa
      Andre Hartmann authored
      The old implementation readed the file and converted the QString toUtf8,
      which seems wrong. Now use Creators default encoding.
      
      This fixes at least wrong macro offsets that leaded to highlighting
      errors in Find Usages, if there were non-ASCII characters before the
      macro definition.
      
      This should also partially solve QTCREATORBUG-7122.
      
      Change-Id: Ic4a5add5f4769bd3d5b62fc2d67598e7abf352d9
      Reviewed-by: default avatarErik Verbruggen <erik.verbruggen@digia.com>
      82d312aa
  15. 05 Oct, 2012 1 commit
  16. 07 Sep, 2012 1 commit
  17. 27 Aug, 2012 1 commit
    • Christian Kandeler's avatar
      Utils: Introduce HostOsInfo class. · e669f054
      Christian Kandeler authored
      The class' member functions are intended to be used
      instead of the Q_OS_* macros in all contexts where
      the latter are not syntactically required.
      This lowers the likelihood of changes made on one
      platform breaking the build on another, e.g. due to
      the code model missing symbols in #ifdef'ed out code
      when refactoring.
      
      Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
      Reviewed-by: default avatarhjk <qthjk@ovi.com>
      e669f054
  18. 19 Jul, 2012 1 commit
  19. 25 Jun, 2012 1 commit
    • 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
  20. 19 Jun, 2012 1 commit
  21. 06 Jun, 2012 1 commit
  22. 05 Jun, 2012 1 commit
    • 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
  23. 01 Jun, 2012 1 commit
    • 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
  24. 19 Apr, 2012 4 commits
  25. 30 Mar, 2012 1 commit
  26. 29 Mar, 2012 3 commits
    • 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
  27. 28 Mar, 2012 1 commit
  28. 27 Mar, 2012 1 commit
  29. 15 Mar, 2012 1 commit
  30. 14 Mar, 2012 1 commit
  31. 06 Mar, 2012 1 commit
  32. 23 Feb, 2012 2 commits
  33. 21 Feb, 2012 1 commit
  34. 20 Feb, 2012 1 commit