diff options
| author | Alain Magloire | 2002-10-11 13:40:51 +0000 |
|---|---|---|
| committer | Alain Magloire | 2002-10-11 13:40:51 +0000 |
| commit | 45377a0e867c1d6522da10fea5e83f869ac69625 (patch) | |
| tree | 9d518a01127818b400f9f7add6bb8ad701f006a6 | |
| parent | f076b37dfaf4286741d98e5ba4a5b2787487c61f (diff) | |
| download | org.eclipse.cdt-45377a0e867c1d6522da10fea5e83f869ac69625.tar.gz org.eclipse.cdt-45377a0e867c1d6522da10fea5e83f869ac69625.tar.xz org.eclipse.cdt-45377a0e867c1d6522da10fea5e83f869ac69625.zip | |
Patch From Thomas Fletcher to add some C/C++ directives.
3 files changed, 12 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog index 788d94a46bf..0492e7a1903 100644 --- a/core/org.eclipse.cdt.ui/ChangeLog +++ b/core/org.eclipse.cdt.ui/ChangeLog @@ -1,5 +1,15 @@ 2002-10-11 Alain Magloire + + * internal/ui/text/CCodeScanner.java: + * internal/ui/text/CppCodeScanner.java: + This updates the C/C++ scanner to include some missing + pre-processor pieces. + From Thomas Fletcher. + +2002-10-11 Alain Magloire + * CEditorTextHoverDispatcher.java (getCurrentTextHover): This fixes a null pointer exception received when we hover over the code in the C/C++ Editor colour preference dialog. From Thomas Fletcher. + diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java index f21db72d873..c20f0c34019 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CCodeScanner.java @@ -52,7 +52,7 @@ public final class CCodeScanner extends AbstractCScanner { private static String[] fgTypes= { "char", "double", "float", "int", "long", "short", "signed", "unsigned", "void", "_Bool", "_Complex", "_Imaginary"}; private static String[] fgConstants= { "NULL", "__DATE__", "__LINE__", "__TIME__", "__FILE__", "__STDC__"}; - private static String[] fgPreprocessor= { "#define", "#include", "#error", "#pragma", "#ifdef", "#ifndef", "#if", "#else", "#elif", "#endif", "#line"}; + private static String[] fgPreprocessor= { "#define", "#undef", "#include", "#error", "#warning", "#pragma", "#ifdef", "#ifndef", "#if", "#else", "#elif", "#endif", "#line"}; private static String[] fgTokenProperties= { diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CppCodeScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CppCodeScanner.java index b4d25a993ea..a6318c00122 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CppCodeScanner.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CppCodeScanner.java @@ -164,7 +164,7 @@ public final class CppCodeScanner extends AbstractCScanner { private static String[] fgTypes= { "bool", "char", "double", "float", "int", "long", "short", "signed", "unsigned", "void", "wchar_t", "_Bool", "_Complex", "_Imaginary"}; private static String[] fgConstants= { "false", "NULL", "true", "__DATE__", "__LINE__", "__TIME__", "__FILE__", "__STDC__"}; - private static String[] fgPreprocessor= { "#define", "#include", "#error", "#pragma", "#ifdef", "#ifndef", "#line", "#undef", "#if", "#else", "#elif", "#endif"}; + private static String[] fgPreprocessor= { "#define", "#undef", "#include", "#error", "#warning", "#pragma", "#ifdef", "#ifndef", "#line", "#undef", "#if", "#else", "#elif", "#endif"}; private static String[] fgTokenProperties= { |