<div dir="ltr">In this patch, "foo" will be parsed as a token of type quotedString and foo (bare string) is of type identifier, but I think we don't need to distinguish one from other. Whether a token was quoted or not is not important for the core linker script interpreter. Can you remove quotedString and just use type identifier?</div>
<div class="gmail_extra"><br><br><div class="gmail_quote">On Mon, Feb 24, 2014 at 9:17 PM, Shankar Easwaran <span dir="ltr"><<a href="mailto:shankare@codeaurora.org" target="_blank">shankare@codeaurora.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: shankare<br>
Date: Mon Feb 24 23:17:24 2014<br>
New Revision: 202111<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=202111&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=202111&view=rev</a><br>
Log:<br>
[LinkerScript] OUTPUT_FORMAT: Parse Quoted Strings<br>
<br>
Added:<br>
lld/trunk/test/LinkerScript/<br>
lld/trunk/test/LinkerScript/linker-script-outputformat.test<br>
lld/trunk/test/LinkerScript/linker-script.test<br>
- copied, changed from r202101, lld/trunk/test/linker-script.test<br>
Removed:<br>
lld/trunk/test/linker-script.test<br>
Modified:<br>
lld/trunk/include/lld/ReaderWriter/LinkerScript.h<br>
lld/trunk/lib/ReaderWriter/LinkerScript.cpp<br>
<br>
Modified: lld/trunk/include/lld/ReaderWriter/LinkerScript.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/LinkerScript.h?rev=202111&r1=202110&r2=202111&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/LinkerScript.h?rev=202111&r1=202110&r2=202111&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/include/lld/ReaderWriter/LinkerScript.h (original)<br>
+++ lld/trunk/include/lld/ReaderWriter/LinkerScript.h Mon Feb 24 23:17:24 2014<br>
@@ -16,6 +16,7 @@<br>
#define LLD_READER_WRITER_LINKER_SCRIPT_H<br>
<br>
#include "lld/Core/LLVM.h"<br>
+#include "lld/Core/range.h"<br>
<br>
#include "llvm/ADT/OwningPtr.h"<br>
#include "llvm/ADT/StringSwitch.h"<br>
@@ -25,6 +26,8 @@<br>
#include "llvm/Support/SourceMgr.h"<br>
#include "llvm/Support/system_error.h"<br>
<br>
+#include <vector><br>
+<br>
namespace lld {<br>
namespace script {<br>
class Token {<br>
@@ -33,6 +36,8 @@ public:<br>
unknown,<br>
eof,<br>
identifier,<br>
+ comma,<br>
+ quotedString,<br>
l_paren,<br>
r_paren,<br>
kw_entry,<br>
@@ -93,21 +98,30 @@ private:<br>
<br>
class OutputFormat : public Command {<br>
public:<br>
- explicit OutputFormat(StringRef format)<br>
- : Command(Kind::OutputFormat), _format(format) {}<br>
+ explicit OutputFormat(StringRef format) : Command(Kind::OutputFormat) {<br>
+ _formats.push_back(format);<br>
+ }<br>
<br>
static bool classof(const Command *c) {<br>
return c->getKind() == Kind::OutputFormat;<br>
}<br>
<br>
virtual void dump(raw_ostream &os) const {<br>
- os << "OUTPUT_FORMAT(" << getFormat() << ")\n";<br>
+ os << "OUTPUT_FORMAT(";<br>
+ for (auto fb = _formats.begin(), fe = _formats.end(); fb != fe; ++fb) {<br>
+ if (fb != _formats.begin())<br>
+ os << ",";<br>
+ os << *fb;<br>
+ }<br>
+ os << ")\n";<br>
}<br>
<br>
- StringRef getFormat() const { return _format; }<br>
+ virtual void addOutputFormat(StringRef format) { _formats.push_back(format); }<br>
+<br>
+ range<StringRef *> getFormats() { return _formats; }<br>
<br>
private:<br>
- StringRef _format;<br>
+ std::vector<StringRef> _formats;<br>
};<br>
<br>
class OutputArch : public Command {<br>
@@ -227,6 +241,8 @@ private:<br>
return true;<br>
}<br>
<br>
+ bool isNextToken(Token::Kind kind) { return (_tok._kind == kind); }<br>
+<br>
OutputFormat *parseOutputFormat();<br>
OutputArch *parseOutputArch();<br>
Group *parseGroup();<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/LinkerScript.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/LinkerScript.cpp?rev=202111&r1=202110&r2=202111&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/LinkerScript.cpp?rev=202111&r1=202110&r2=202111&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/LinkerScript.cpp (original)<br>
+++ lld/trunk/lib/ReaderWriter/LinkerScript.cpp Mon Feb 24 23:17:24 2014<br>
@@ -29,6 +29,8 @@ void Token::dump(raw_ostream &os) const<br>
CASE(kw_group)<br>
CASE(kw_output_format)<br>
CASE(kw_output_arch)<br>
+ CASE(quotedString)<br>
+ CASE(comma)<br>
CASE(l_paren)<br>
CASE(r_paren)<br>
CASE(unknown)<br>
@@ -67,7 +69,12 @@ bool Lexer::canContinueName(char c) cons<br>
case '0': case '1': case '2': case '3': case '4': case '5': case '6':<br>
case '7': case '8': case '9':<br>
case '_': case '.': case '$': case '/': case '\\': case '~': case '=':<br>
- case '+': case ',': case '[': case ']': case '*': case '?': case '-':<br>
+ case '+':<br>
+ case '[':<br>
+ case ']':<br>
+ case '*':<br>
+ case '?':<br>
+ case '-':<br>
case ':':<br>
return true;<br>
default:<br>
@@ -94,7 +101,23 @@ void Lexer::lex(Token &tok) {<br>
tok = Token(_buffer.substr(0, 1), Token::r_paren);<br>
_buffer = _buffer.drop_front();<br>
return;<br>
+ case ',':<br>
+ tok = Token(_buffer.substr(0, 1), Token::comma);<br>
+ _buffer = _buffer.drop_front();<br>
+ return;<br>
default:<br>
+ // Quoted strings ?<br>
+ if ((_buffer[0] == '\"') || (_buffer[0] == '\'')) {<br>
+ char c = _buffer[0];<br>
+ _buffer = _buffer.drop_front();<br>
+ auto quotedStringEnd = _buffer.find(c);<br>
+ if (quotedStringEnd == StringRef::npos || quotedStringEnd == 0)<br>
+ break;<br>
+ StringRef word = _buffer.substr(0, quotedStringEnd);<br>
+ tok = Token(word, Token::quotedString);<br>
+ _buffer = _buffer.drop_front(quotedStringEnd + 1);<br>
+ return;<br>
+ }<br>
/// keyword or identifer.<br>
if (!canStartName(_buffer[0]))<br>
break;<br>
@@ -215,14 +238,27 @@ OutputFormat *Parser::parseOutputFormat(<br>
if (!expectAndConsume(Token::l_paren, "expected ("))<br>
return nullptr;<br>
<br>
- if (_tok._kind != Token::identifier) {<br>
- error(_tok, "Expected identifier in OUTPUT_FORMAT.");<br>
+ if (_tok._kind != Token::quotedString && _tok._kind != Token::identifier) {<br>
+ error(_tok, "Expected identifier/string in OUTPUT_FORMAT.");<br>
return nullptr;<br>
}<br>
<br>
auto ret = new (_alloc) OutputFormat(_tok._range);<br>
consumeToken();<br>
<br>
+ do {<br>
+ if (isNextToken(Token::comma))<br>
+ consumeToken();<br>
+ else<br>
+ break;<br>
+ if (_tok._kind != Token::quotedString && _tok._kind != Token::identifier) {<br>
+ error(_tok, "Expected identifier/string in OUTPUT_FORMAT.");<br>
+ return nullptr;<br>
+ }<br>
+ ret->addOutputFormat(_tok._range);<br>
+ consumeToken();<br>
+ } while (isNextToken(Token::comma));<br>
+<br>
if (!expectAndConsume(Token::r_paren, "expected )"))<br>
return nullptr;<br>
<br>
<br>
Added: lld/trunk/test/LinkerScript/linker-script-outputformat.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/LinkerScript/linker-script-outputformat.test?rev=202111&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/LinkerScript/linker-script-outputformat.test?rev=202111&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/LinkerScript/linker-script-outputformat.test (added)<br>
+++ lld/trunk/test/LinkerScript/linker-script-outputformat.test Mon Feb 24 23:17:24 2014<br>
@@ -0,0 +1,12 @@<br>
+/* RUN: linker-script-test %s | FileCheck %s<br>
+*/<br>
+<br>
+OUTPUT_FORMAT(elf64-x86-64)<br>
+<br>
+/*<br>
+CHECK: kw_output_format: OUTPUT_FORMAT<br>
+CHECK: l_paren: (<br>
+CHECK: identifier: elf64-x86-64<br>
+CHECK: r_paren: )<br>
+CHECK: OUTPUT_FORMAT(elf64-x86-64)<br>
+*/<br>
<br>
Copied: lld/trunk/test/LinkerScript/linker-script.test (from r202101, lld/trunk/test/linker-script.test)<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/LinkerScript/linker-script.test?p2=lld/trunk/test/LinkerScript/linker-script.test&p1=lld/trunk/test/linker-script.test&r1=202101&r2=202111&rev=202111&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/LinkerScript/linker-script.test?p2=lld/trunk/test/LinkerScript/linker-script.test&p1=lld/trunk/test/linker-script.test&r1=202101&r2=202111&rev=202111&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/linker-script.test (original)<br>
+++ lld/trunk/test/LinkerScript/linker-script.test Mon Feb 24 23:17:24 2014<br>
@@ -2,7 +2,7 @@<br>
*/<br>
<br>
OUTPUT_ARCH(i386:x86_64)<br>
-OUTPUT_FORMAT(elf64-x86-64)<br>
+OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64")<br>
GROUP ( /lib/x86_64-linux-gnu/libc.so.6 /usr/lib/x86_64-linux-gnu/libc_nonshared.a AS_NEEDED ( /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ) )<br>
ENTRY(init)<br>
<br>
@@ -13,7 +13,11 @@ CHECK: identifier: i386:x86_64<br>
CHECK: r_paren: )<br>
CHECK: kw_output_format: OUTPUT_FORMAT<br>
CHECK: l_paren: (<br>
-CHECK: identifier: elf64-x86-64<br>
+CHECK: quotedString: elf64-x86-64<br>
+CHECK: comma: ,<br>
+CHECK: quotedString: elf64-x86-64<br>
+CHECK: comma: ,<br>
+CHECK: quotedString: elf64-x86-64<br>
CHECK: r_paren: )<br>
CHECK: kw_group: GROUP<br>
CHECK: l_paren: (<br>
@@ -29,7 +33,7 @@ CHECK: l_paren: (<br>
CHECK: identifier: init<br>
CHECK: r_paren: )<br>
CHECK: eof:<br>
-CHECK: OUTPUT_FORMAT(elf64-x86-64)<br>
+CHECK: OUTPUT_FORMAT(elf64-x86-64,elf64-x86-64,elf64-x86-64)<br>
CHECK: GROUP(/lib/x86_64-linux-gnu/libc.so.6 /usr/lib/x86_64-linux-gnu/libc_nonshared.a AS_NEEDED(/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2))<br>
CHECK: ENTRY(init)<br>
*/<br>
<br>
Removed: lld/trunk/test/linker-script.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/linker-script.test?rev=202110&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/linker-script.test?rev=202110&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/linker-script.test (original)<br>
+++ lld/trunk/test/linker-script.test (removed)<br>
@@ -1,35 +0,0 @@<br>
-/* RUN: linker-script-test %s | FileCheck %s<br>
-*/<br>
-<br>
-OUTPUT_ARCH(i386:x86_64)<br>
-OUTPUT_FORMAT(elf64-x86-64)<br>
-GROUP ( /lib/x86_64-linux-gnu/libc.so.6 /usr/lib/x86_64-linux-gnu/libc_nonshared.a AS_NEEDED ( /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 ) )<br>
-ENTRY(init)<br>
-<br>
-/*<br>
-CHECK: kw_output_arch: OUTPUT_ARCH<br>
-CHECK: l_paren: (<br>
-CHECK: identifier: i386:x86_64<br>
-CHECK: r_paren: )<br>
-CHECK: kw_output_format: OUTPUT_FORMAT<br>
-CHECK: l_paren: (<br>
-CHECK: identifier: elf64-x86-64<br>
-CHECK: r_paren: )<br>
-CHECK: kw_group: GROUP<br>
-CHECK: l_paren: (<br>
-CHECK: identifier: /lib/x86_64-linux-gnu/libc.so.6<br>
-CHECK: identifier: /usr/lib/x86_64-linux-gnu/libc_nonshared.a<br>
-CHECK: kw_as_needed: AS_NEEDED<br>
-CHECK: l_paren: (<br>
-CHECK: identifier: /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2<br>
-CHECK: r_paren: )<br>
-CHECK: r_paren: )<br>
-CHECK: kw_entry: ENTRY<br>
-CHECK: l_paren: (<br>
-CHECK: identifier: init<br>
-CHECK: r_paren: )<br>
-CHECK: eof:<br>
-CHECK: OUTPUT_FORMAT(elf64-x86-64)<br>
-CHECK: GROUP(/lib/x86_64-linux-gnu/libc.so.6 /usr/lib/x86_64-linux-gnu/libc_nonshared.a AS_NEEDED(/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2))<br>
-CHECK: ENTRY(init)<br>
-*/<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>