[Bash-autocompletion] Add support for -std=

[yamaguchi]

Summary

Add support for autocompleting values of -std= by including
LangStandards.def. This patch relies on D36782, and is using two-stage
code generation.

[ruiu]

clang/include/clang/Driver/Options.td

2254 ↗

(On Diff #111471)

const char* Values -> const char *Values

2254–2258 ↗

(On Diff #111471)

I think Raphael suggested indenting embedded code with at least 2 spaces. I think you want to indent it with 4 spaces so that it looks better.

llvm/utils/TableGen/OptParserEmitter.cpp

314 ↗

(On Diff #111471)

Why do you have to change this? The previous code looks nicer.

[yamaguchi]

Update diff.

[yamaguchi]

llvm/utils/TableGen/OptParserEmitter.cpp

314 ↗

(On Diff #111471)

Because I got an error that ValuesWereAdded are defined several times.

[ruiu]

llvm/utils/TableGen/OptParserEmitter.cpp

314 ↗

(On Diff #111471)

Okay, but I think at least you want to move the definition into the scope that line 310 defines, so that the scope of the variable ends at the code that line 322 emits.

[yamaguchi]

Update diff.

[ruiu]

llvm/utils/TableGen/OptParserEmitter.cpp

308 ↗

(On Diff #111611)

You can flip the condition to do early continue.

319–320 ↗

(On Diff #111611)

Can you split the string after each "\n"? It seems the current way of splitting is somewhat arbitrary.

[yamaguchi]

llvm/utils/TableGen/OptParserEmitter.cpp

319–320 ↗

(On Diff #111611)

Those code are on review in D36782 and I've fixed it, so I think it's fine now :)

[yamaguchi]

Update diff. Thank you for your comments!

[ruiu]

LGTM

[v.g.vassilev]

LGTM +ping!

cfe/trunk/include/clang/Driver/Options.td

 def single__module : Flag<["-"], "single_module">;
 def specs_EQ : Joined<["-", "--"], "specs=">;
 def specs : Separate<["-", "--"], "specs">, Flags<[Unsupported]>;
 def static_libgcc : Flag<["-"], "static-libgcc">;
 def static_libstdcxx : Flag<["-"], "static-libstdc++">;
 def static : Flag<["-", "--"], "static">, Flags<[NoArgumentUnused]>;
 def std_default_EQ : Joined<["-"], "std-default=">;
 def std_EQ : Joined<["-", "--"], "std=">, Flags<[CC1Option]>,
-  Group<CompileOnly_Group>, HelpText<"Language standard to compile for">;
+  Group<CompileOnly_Group>, HelpText<"Language standard to compile for">,
+  ValuesCode<[{
+    const char *Values =
+    #define LANGSTANDARD(id, name, lang, desc, features) name ","
+    #define LANGSTANDARD_ALIAS(id, alias) alias ","
+    #include "clang/Frontend/LangStandards.def"
+    ;
+  }]>;
 def stdlib_EQ : Joined<["-", "--"], "stdlib=">, Flags<[CC1Option]>,
   HelpText<"C++ standard library to use">, Values<"libc++,libstdc++,platform">;
 def sub__library : JoinedOrSeparate<["-"], "sub_library">;
 def sub__umbrella : JoinedOrSeparate<["-"], "sub_umbrella">;
 def system_header_prefix : Joined<["--"], "system-header-prefix=">,
   Group<clang_i_Group>, Flags<[CC1Option]>, MetaVarName<"<prefix>">,
   HelpText<"Treat all #include paths starting with <prefix> as including a "
            "system header.">;

cfe/trunk/test/Driver/autocomplete.c

 // WARNING-NEXT: -Wmain-return-type
 // WARNING-NEXT: -Wmalformed-warning-check
 // WARNING-NEXT: -Wmany-braces-around-scalar-init
 // WARNING-NEXT: -Wmax-unsigned-zero
 // RUN: %clang --autocomplete=-Wno-invalid-pp- | FileCheck %s -check-prefix=NOWARNING
 // NOWARNING: -Wno-invalid-pp-token
 // RUN: %clang --autocomplete=-analyzer-checker, | FileCheck %s -check-prefix=ANALYZER
 // ANALYZER: unix.Malloc
+// RUN: %clang --autocomplete=-std=, | FileCheck %s -check-prefix=STDVAL
+// STDVAL: c99

llvm/trunk/utils/TableGen/OptParserEmitter.cpp

void EmitOptParser(RecordKeeper &Records, raw_ostream &OS) {
   OS << "#ifdef OPTTABLE_ARG_INIT\n";
   OS << "//////////\n";
   OS << "// Option Values\n\n";
   for (unsigned I = 0, E = Opts.size(); I != E; ++I) {
     const Record &R = *Opts[I];
     if (isa<UnsetInit>(R.getValueInit("ValuesCode")))
       continue;
     OS << "{\n";
+    OS << "bool ValuesWereAdded;\n";
     OS << R.getValueAsString("ValuesCode");
     OS << "\n";
     for (const std::string &Pref : R.getValueAsListOfStrings("Prefixes")) {
-      OS << "bool ValuesWereAdded = ";
-      OS << "Opt.addValues(";
+      OS << "ValuesWereAdded = Opt.addValues(";
       std::string S = (Pref + R.getValueAsString("Name")).str();
       write_cstring(OS, S);
       OS << ", Values);\n";
       OS << "(void)ValuesWereAdded;\n";
       OS << "assert(ValuesWereAdded && \"Couldn't add values to "
             "OptTable!\");\n";
     }
     OS << "}\n";
   }
   OS << "\n";
   OS << "#endif // OPTTABLE_ARG_INIT\n";
 }
 } // end namespace llvm