From e0e8d373e6ebd897010753d0259468b68509a5bf Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 24 Nov 2018 17:45:57 +0000
Subject: [PATCH] Added some changes in parser and string variable to allow strings as variables.
---
aoi_gen/BerkiParse.py | 4 ++--
aoi_gen/Variable.py | 4 ++--
aoi_gen/Generators.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/aoi_gen/BerkiParse.py b/aoi_gen/BerkiParse.py
index 1d3e622..d77911a 100644
--- a/aoi_gen/BerkiParse.py
+++ b/aoi_gen/BerkiParse.py
@@ -104,7 +104,7 @@
"unit": None,
}
for r in s.split("\n"):
- sp = r.split(":")
+ sp = r.split(":", 1)
if sp[0].strip("\n\t'") == "formula":
retval["correct"].append(sp[1].strip("\n\t"))
elif sp[0].strip() == "napacna":
@@ -128,7 +128,7 @@
"generator": None,
}
for r in v.split("\n"):
- sp = r.split(":")
+ sp = r.split(":", 1)
if sp[0].strip("\n\t'") == "ime":
name = sp[1].strip("\n\t'")
retval["name"] = name
diff --git a/aoi_gen/Generators.py b/aoi_gen/Generators.py
index 8c0e78f..59d769a 100644
--- a/aoi_gen/Generators.py
+++ b/aoi_gen/Generators.py
@@ -27,7 +27,7 @@
)
try:
- self.pool = [float(i) for i in arglist]
+ self.pool = [i for i in arglist]
except (ValueError, TypeError):
raise ValueError
diff --git a/aoi_gen/Variable.py b/aoi_gen/Variable.py
index f27d718..29009b7 100644
--- a/aoi_gen/Variable.py
+++ b/aoi_gen/Variable.py
@@ -108,10 +108,10 @@
pass
def toFormat(self, string):
- return string
+ return string.replace("\"", "")
def getValue(self, string):
- return string
+ return "\"{}\"".format(str(string.replace("\"", "")))
class DecFloatFormatter(FormatterFactory):
def __init__(self, formatparameters):
--
Gitblit v1.8.0