cmd/geth: add --config file flag (#13875)
* p2p/discover, p2p/discv5: add marshaling methods to Node * p2p/netutil: make Netlist decodable from TOML * common/math: encode nil HexOrDecimal256 as 0x0 * cmd/geth: add --config file flag * cmd/geth: add missing license header * eth: prettify Config again, fix tests * eth: use gasprice.Config instead of duplicating its fields * eth/gasprice: hide nil default from dumpconfig output * cmd/geth: hide genesis block in dumpconfig output * node: make tests compile * console: fix tests * cmd/geth: make TOML keys look exactly like Go struct fields * p2p: use discovery by default This makes the zero Config slightly more useful. It also fixes package node tests because Node detects reuse of the datadir through the NodeDatabase. * cmd/geth: make ethstats URL settable through config file * cmd/faucet: fix configuration * cmd/geth: dedup attach tests * eth: add comment for DefaultConfig * eth: pass downloader.SyncMode in Config This removes the FastSync, LightSync flags in favour of a more general SyncMode flag. * cmd/utils: remove jitvm flags * cmd/utils: make mutually exclusive flag error prettier It now reads: Fatal: flags --dev, --testnet can't be used at the same time * p2p: fix typo * node: add DefaultConfig, use it for geth * mobile: add missing NoDiscovery option * cmd/utils: drop MakeNode This exposed a couple of places that needed to be updated to use node.DefaultConfig. * node: fix typo * eth: make fast sync the default mode * cmd/utils: remove IPCApiFlag (unused) * node: remove default IPC path Set it in the frontends instead. * cmd/geth: add --syncmode * cmd/utils: make --ipcdisable and --ipcpath mutually exclusive * cmd/utils: don't enable WS, HTTP when setting addr * cmd/utils: fix --identity
This commit is contained in:
committed by
Péter Szilágyi
parent
b57680b0b2
commit
30d706c35e
145
vendor/github.com/naoina/toml/parse.peg
generated
vendored
Normal file
145
vendor/github.com/naoina/toml/parse.peg
generated
vendored
Normal file
@ -0,0 +1,145 @@
|
||||
package toml
|
||||
|
||||
type tomlParser Peg {
|
||||
toml
|
||||
}
|
||||
|
||||
TOML <- Expression (newline Expression)* newline? !. { _ = buffer }
|
||||
|
||||
Expression <- (
|
||||
<ws table ws comment? (wsnl keyval ws comment?)*> { p.SetTableString(begin, end) }
|
||||
/ ws keyval ws comment?
|
||||
/ ws comment?
|
||||
/ ws
|
||||
)
|
||||
|
||||
newline <- <[\r\n]+> { p.AddLineCount(end - begin) }
|
||||
|
||||
ws <- [ \t]*
|
||||
wsnl <- (
|
||||
[ \t]
|
||||
/ <[\r\n]> { p.AddLineCount(end - begin) }
|
||||
)*
|
||||
|
||||
comment <- '#' <[\t -\0x10FFFF]*>
|
||||
|
||||
keyval <- key ws '=' ws val { p.AddKeyValue() }
|
||||
|
||||
key <- bareKey / quotedKey
|
||||
|
||||
bareKey <- <[0-9A-Za-z\-_]+> { p.SetKey(p.buffer, begin, end) }
|
||||
|
||||
quotedKey <- '"' <basicChar+> '"' { p.SetKey(p.buffer, begin-1, end+1) }
|
||||
|
||||
val <- (
|
||||
<datetime> { p.SetTime(begin, end) }
|
||||
/ <float> { p.SetFloat64(begin, end) }
|
||||
/ <integer> { p.SetInt64(begin, end) }
|
||||
/ <string> { p.SetString(begin, end) }
|
||||
/ <boolean> { p.SetBool(begin, end) }
|
||||
/ <array> { p.SetArray(begin, end) }
|
||||
/ inlineTable
|
||||
)
|
||||
|
||||
table <- stdTable / arrayTable
|
||||
|
||||
stdTable <- '[' ws <tableKey> ws ']' { p.SetTable(p.buffer, begin, end) }
|
||||
|
||||
arrayTable <- '[[' ws <tableKey> ws ']]' { p.SetArrayTable(p.buffer, begin, end) }
|
||||
|
||||
inlineTable <- (
|
||||
'{' { p.StartInlineTable() }
|
||||
ws inlineTableKeyValues ws
|
||||
'}' { p.EndInlineTable() }
|
||||
)
|
||||
|
||||
inlineTableKeyValues <- (keyval inlineTableValSep?)*
|
||||
|
||||
tableKey <- key (tableKeySep key)*
|
||||
|
||||
tableKeySep <- ws '.' ws
|
||||
|
||||
inlineTableValSep <- ws ',' ws
|
||||
|
||||
integer <- [\-+]? int
|
||||
int <- [1-9] (digit / '_' digit)+ / digit
|
||||
|
||||
float <- integer (frac exp? / frac? exp)
|
||||
frac <- '.' digit (digit / '_' digit)*
|
||||
exp <- [eE] [\-+]? digit (digit / '_' digit)*
|
||||
|
||||
string <- (
|
||||
mlLiteralString
|
||||
/ literalString
|
||||
/ mlBasicString
|
||||
/ basicString
|
||||
)
|
||||
|
||||
basicString <- <'"' basicChar* '"'> { p.SetBasicString(p.buffer, begin, end) }
|
||||
|
||||
basicChar <- basicUnescaped / escaped
|
||||
escaped <- escape ([btnfr"/\\] / 'u' hexQuad / 'U' hexQuad hexQuad)
|
||||
|
||||
basicUnescaped <- [ -!#-\[\]-\0x10FFFF]
|
||||
|
||||
escape <- '\\'
|
||||
|
||||
mlBasicString <- '"""' mlBasicBody '"""' { p.SetMultilineString() }
|
||||
|
||||
mlBasicBody <- (
|
||||
<basicChar / newline> { p.AddMultilineBasicBody(p.buffer, begin, end) }
|
||||
/ escape newline wsnl
|
||||
)*
|
||||
|
||||
literalString <- "'" <literalChar*> "'" { p.SetLiteralString(p.buffer, begin, end) }
|
||||
|
||||
literalChar <- [\t -&(-\0x10FFFF]
|
||||
|
||||
mlLiteralString <- "'''" <mlLiteralBody> "'''" { p.SetMultilineLiteralString(p.buffer, begin, end) }
|
||||
|
||||
mlLiteralBody <- (!"'''" (mlLiteralChar / newline))*
|
||||
|
||||
mlLiteralChar <- [\t -\0x10FFFF]
|
||||
|
||||
hexdigit <- [0-9A-Fa-f]
|
||||
hexQuad <- hexdigit hexdigit hexdigit hexdigit
|
||||
|
||||
boolean <- 'true' / 'false'
|
||||
|
||||
dateFullYear <- digitQuad
|
||||
dateMonth <- digitDual
|
||||
dateMDay <- digitDual
|
||||
timeHour <- digitDual
|
||||
timeMinute <- digitDual
|
||||
timeSecond <- digitDual
|
||||
timeSecfrac <- '.' digit+
|
||||
timeNumoffset <- [\-+] timeHour ':' timeMinute
|
||||
timeOffset <- 'Z' / timeNumoffset
|
||||
partialTime <- timeHour ':' timeMinute ':' timeSecond timeSecfrac?
|
||||
fullDate <- dateFullYear '-' dateMonth '-' dateMDay
|
||||
fullTime <- partialTime timeOffset
|
||||
datetime <- (fullDate ('T' fullTime)?) / partialTime
|
||||
|
||||
digit <- [0-9]
|
||||
digitDual <- digit digit
|
||||
digitQuad <- digitDual digitDual
|
||||
|
||||
array <- (
|
||||
'[' { p.StartArray() }
|
||||
wsnl arrayValues? wsnl
|
||||
']'
|
||||
)
|
||||
|
||||
arrayValues <- (
|
||||
val { p.AddArrayVal() }
|
||||
(
|
||||
wsnl comment?
|
||||
wsnl arraySep
|
||||
wsnl comment?
|
||||
wsnl val { p.AddArrayVal() }
|
||||
)*
|
||||
wsnl arraySep?
|
||||
wsnl comment?
|
||||
)
|
||||
|
||||
arraySep <- ','
|
Reference in New Issue
Block a user