From 0831386798dcd5ee80239305fe9ad745c9f83b90 Mon Sep 17 00:00:00 2001 From: bdew Date: Tue, 29 Apr 2014 16:10:41 +0300 Subject: [PATCH] Added hex numbers support in config parser (0x12345678) --- .../bdew/lib/recipes/gencfg/GenericConfigParser.scala | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/net/bdew/lib/recipes/gencfg/GenericConfigParser.scala b/src/net/bdew/lib/recipes/gencfg/GenericConfigParser.scala index 6ed18e5..e303eb8 100644 --- a/src/net/bdew/lib/recipes/gencfg/GenericConfigParser.scala +++ b/src/net/bdew/lib/recipes/gencfg/GenericConfigParser.scala @@ -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