ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=c0654b6c4e082f8489060c2875a46aeb28d0001a
commit c0654b6c4e082f8489060c2875a46aeb28d0001a
Author: Andy Williams <a...@andywilliams.me>
Date: Sun Apr 12 16:47:53 2015 +0100
clang: remove debugging
---
src/bin/editor/clang_debug.h | 198 -------------------------------------------
src/bin/editor/edi_editor.c | 28 +-----
2 files changed, 1 insertion(+), 225 deletions(-)
diff --git a/src/bin/editor/clang_debug.h b/src/bin/editor/clang_debug.h
deleted file mode 100644
index 7a9e6c6..0000000
--- a/src/bin/editor/clang_debug.h
+++ /dev/null
@@ -1,198 +0,0 @@
-#ifndef _CLANG_DEBUG_H
-#define _CLANG_DEBUG_H
-#include <clang-c/Index.h>
-
-static void PrintExtent(FILE *out, unsigned begin_line, unsigned begin_column,
- unsigned end_line, unsigned end_column) {
- fprintf(out, "[%d:%d - %d:%d]", begin_line, begin_column,
- end_line, end_column);
-}
-
-static void PrintRange(CXSourceRange R, const char *str) {
- CXFile begin_file, end_file;
- unsigned begin_line, begin_column, end_line, end_column;
-
- clang_getSpellingLocation(clang_getRangeStart(R),
- &begin_file, &begin_line, &begin_column, 0);
- clang_getSpellingLocation(clang_getRangeEnd(R),
- &end_file, &end_line, &end_column, 0);
- if (!begin_file || !end_file)
- return;
-
- if (str)
- printf(" %s=", str);
- PrintExtent(stdout, begin_line, begin_column, end_line, end_column);
-}
-
-void PrintToken(CXTranslationUnit tx, CXToken token)
-{
- CXString str = clang_getTokenSpelling(tx, token);
- PrintRange(clang_getTokenExtent(tx, token), clang_getCString(str));
- clang_disposeString(str);
-}
-
-int want_display_name = 0;
-
-void PrintCursor(CXCursor Cursor) {
- CXTranslationUnit TU = clang_Cursor_getTranslationUnit(Cursor);
- if (clang_isInvalid(Cursor.kind)) {
- CXString ks = clang_getCursorKindSpelling(Cursor.kind);
- printf("Invalid Cursor => %s", clang_getCString(ks));
- clang_disposeString(ks);
- }
- else {
- CXString string, ks;
- CXCursor Referenced;
- unsigned line, column;
- CXCursor SpecializationOf;
- CXCursor *overridden;
- unsigned num_overridden;
- unsigned RefNameRangeNr;
- CXSourceRange CursorExtent;
- CXSourceRange RefNameRange;
-
- ks = clang_getCursorKindSpelling(Cursor.kind);
- string = want_display_name? clang_getCursorDisplayName(Cursor)
- : clang_getCursorSpelling(Cursor);
- printf("%s=%s", clang_getCString(ks),
- clang_getCString(string));
- clang_disposeString(ks);
- clang_disposeString(string);
-
- Referenced = clang_getCursorReferenced(Cursor);
- if (!clang_equalCursors(Referenced, clang_getNullCursor())) {
- if (clang_getCursorKind(Referenced) == CXCursor_OverloadedDeclRef) {
- unsigned I, N = clang_getNumOverloadedDecls(Referenced);
- printf("[");
- for (I = 0; I != N; ++I) {
- CXCursor Ovl = clang_getOverloadedDecl(Referenced, I);
- CXSourceLocation Loc;
- if (I)
- printf(", ");
-
- Loc = clang_getCursorLocation(Ovl);
- clang_getSpellingLocation(Loc, 0, &line, &column, 0);
- printf("%d:%d", line, column);
- }
- printf("]");
- } else {
- CXFile cfile;
- CXSourceLocation Loc = clang_getCursorLocation(Referenced);
- clang_getSpellingLocation(Loc, &cfile, &line, &column, 0);
- CXString str = clang_getFileName(cfile);
- printf(":%s:%d:%d", clang_getCString(str), line, column);
- clang_disposeString(str);
- }
- }
-
- if (clang_isCursorDefinition(Cursor))
- printf(" (Definition)");
-
- switch (clang_getCursorAvailability(Cursor)) {
- case CXAvailability_Available:
- break;
-
- case CXAvailability_Deprecated:
- printf(" (deprecated)");
- break;
-
- case CXAvailability_NotAvailable:
- printf(" (unavailable)");
- break;
-
- case CXAvailability_NotAccessible:
- printf(" (inaccessible)");
- break;
- }
-
- if (clang_CXXMethod_isStatic(Cursor))
- printf(" (static)");
- if (clang_CXXMethod_isVirtual(Cursor))
- printf(" (virtual)");
-
- if (Cursor.kind == CXCursor_IBOutletCollectionAttr) {
- CXType T =
- clang_getCanonicalType(clang_getIBOutletCollectionType(Cursor));
- CXString S = clang_getTypeKindSpelling(T.kind);
- printf(" [IBOutletCollection=%s]", clang_getCString(S));
- clang_disposeString(S);
- }
-
- if (Cursor.kind == CXCursor_CXXBaseSpecifier) {
- enum CX_CXXAccessSpecifier access = clang_getCXXAccessSpecifier(Cursor);
- unsigned isVirtual = clang_isVirtualBase(Cursor);
- const char *accessStr = 0;
-
- switch (access) {
- case CX_CXXInvalidAccessSpecifier:
- accessStr = "invalid"; break;
- case CX_CXXPublic:
- accessStr = "public"; break;
- case CX_CXXProtected:
- accessStr = "protected"; break;
- case CX_CXXPrivate:
- accessStr = "private"; break;
- }
-
- printf(" [access=%s isVirtual=%s]", accessStr,
- isVirtual ? "true" : "false");
- }
-
- SpecializationOf = clang_getSpecializedCursorTemplate(Cursor);
- if (!clang_equalCursors(SpecializationOf, clang_getNullCursor())) {
- CXSourceLocation Loc = clang_getCursorLocation(SpecializationOf);
- CXString Name = clang_getCursorSpelling(SpecializationOf);
- clang_getSpellingLocation(Loc, 0, &line, &column, 0);
- printf(" [Specialization of %s:%d:%d]",
- clang_getCString(Name), line, column);
- clang_disposeString(Name);
- }
-
- clang_getOverriddenCursors(Cursor, &overridden, &num_overridden);
- if (num_overridden) {
- unsigned I;
- printf(" [Overrides ");
- for (I = 0; I != num_overridden; ++I) {
- CXSourceLocation Loc = clang_getCursorLocation(overridden[I]);
- clang_getSpellingLocation(Loc, 0, &line, &column, 0);
- if (I)
- printf(", ");
- printf("@%d:%d", line, column);
- }
- printf("]");
- clang_disposeOverriddenCursors(overridden);
- }
-
- if (Cursor.kind == CXCursor_InclusionDirective) {
- CXFile File = clang_getIncludedFile(Cursor);
- CXString Included = clang_getFileName(File);
- printf(" (%s)", clang_getCString(Included));
- clang_disposeString(Included);
-
- if (clang_isFileMultipleIncludeGuarded(TU, File))
- printf(" [multi-include guarded]");
- }
-
- CursorExtent = clang_getCursorExtent(Cursor);
- RefNameRange = clang_getCursorReferenceNameRange(Cursor,
- CXNameRange_WantQualifier
- | CXNameRange_WantSinglePiece
- |
CXNameRange_WantTemplateArgs,
- 0);
- if (!clang_equalRanges(CursorExtent, RefNameRange))
- PrintRange(RefNameRange, "SingleRefName");
-
- for (RefNameRangeNr = 0; 1; RefNameRangeNr++) {
- RefNameRange = clang_getCursorReferenceNameRange(Cursor,
- CXNameRange_WantQualifier
- |
CXNameRange_WantTemplateArgs,
- RefNameRangeNr);
- if (clang_equalRanges(clang_getNullRange(), RefNameRange))
- break;
- if (!clang_equalRanges(CursorExtent, RefNameRange))
- PrintRange(RefNameRange, "RefName");
- }
- }
-}
-#endif
-
diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index bd8e6cd..a932913 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -10,11 +10,6 @@
#include "edi_editor.h"
-#define CLANG_DEBUG 0
-#if CLANG_DEBUG
-#include "clang_debug.h"
-#endif
-
#include "mainview/edi_mainview.h"
#include "edi_config.h"
@@ -433,29 +428,8 @@ _clang_show_highlighting(Edi_Editor *editor)
}
_edi_range_color_set(editor, range, type);
-
-# if CLANG_DEBUG
- const char *kind = NULL;
- switch (clang_getTokenKind(editor->tokens[i])) {
- case CXToken_Punctuation: kind = "Punctuation"; break;
- case CXToken_Keyword: kind = "Keyword"; break;
- case CXToken_Identifier: kind = "Identifier"; break;
- case CXToken_Literal: kind = "Literal"; break;
- case CXToken_Comment: kind = "Comment"; break;
- }
-
- printf("%s ", kind);
- PrintToken(editor->tx_unit, editor->tokens[i]);
-
- if (!clang_isInvalid(editor->cursors[i].kind)) {
- printf(" ");
- PrintCursor(editor->cursors[i]);
- }
-
- printf("\n");
-# endif
}
- }
+}
static void
_clang_free_highlighting(Edi_Editor *editor)
--
