mirror of
https://github.com/GTNewHorizons/bdlib.git
synced 2026-11-21 04:32:32 +00:00
Added hex numbers support in config parser (0x12345678)
This commit is contained in:
1 parent
0b45c61c51
commit
0831386798
1 file changed
+8
-3
@@ -13,12 +13,17 @@ import net.bdew.lib.recipes.RecipeParser
|
||||
|
||||
trait GenericConfigParser extends RecipeParser {
|
||||
override def statement = statementCfg | super.statement
|
||||
def negativeNumber = "-" ~> decimalNumber ^^ { case x => "-" + x }
|
||||
def signedNumber = decimalNumber | negativeNumber
|
||||
|
||||
// Hex variant must come before decimalNumber, otherwise the parser breaks
|
||||
def signedNumber = (
|
||||
("0x" ~> "[0-9A-Fa-f]+".r) ^^ { case x => Integer.parseInt(x, 16).toDouble }
|
||||
| decimalNumber ^^ { case x => x.toDouble }
|
||||
| ("-" ~> decimalNumber) ^^ { case x => -x.toDouble }
|
||||
)
|
||||
|
||||
def cfgStatementNum = ident ~ "=" ~ signedNumber ^^ { case id ~ eq ~ n => CfgVal(id, EntryDouble(n.toDouble)) }
|
||||
def cfgStatementStr = ident ~ "=" ~ str ^^ { case id ~ eq ~ s => CfgVal(id, EntryStr(s)) }
|
||||
def cfgStatementNumList = ident ~ ("=" ~> "{" ~> signedNumber.* <~ "}") ^^ { case id ~ l => CfgVal(id, EntryNumList(l.map(_.toDouble))) }
|
||||
def cfgStatementNumList = ident ~ ("=" ~> "{" ~> signedNumber.* <~ "}") ^^ { case id ~ l => CfgVal(id, EntryNumList(l)) }
|
||||
def cfgStatementSub = cfgBlock ^^ { case (id, st) => CfgSub(id, st) }
|
||||
|
||||
def cfgStatement = cfgStatementNum | cfgStatementStr | cfgStatementSub | cfgStatementNumList
|
||||
|
||||
Reference in new issue
Block a user