carpentry/gt4carp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

better carp bridge

Browse Source
This commit is contained in:
Veit Heller
2022-06-13 22:16:23 +02:00
parent 7fbab0e2a0
commit 6efcea643f
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
carp/src/bridge/carp.py
View File

@@ -8,6 +8,7 @@ class CarpProc:
self.proc = diplomat.Diplomat('carp') self.proc = diplomat.Diplomat('carp')
self._version_info = None self._version_info = None
self.adornment_re = re.compile(".\[33m.*?\[0m") self.adornment_re = re.compile(".\[33m.*?\[0m")
self.warning_re = re.compile("\[WARNING\] (.*)\n?")
def wait_for_boot(self): def wait_for_boot(self):
while not self.proc.output(): while not self.proc.output():
@@ -23,11 +24,13 @@ class CarpProc:
while self.proc.output() == old_output: while self.proc.output() == old_output:
time.sleep(0.5) time.sleep(0.5)
res = self.adornment_re.sub("", self.proc.output()[len(old_output):]).strip() res = self.adornment_re.sub("", self.proc.output()[len(old_output):]).strip()
warnings = self.warning_re.findall(res)
res = self.warning_re.sub("", res)
if res.startswith("=> "): if res.startswith("=> "):
return {'result': 'success', 'value': res[3:]} return {'result': 'success', 'value': res[3:], 'warnings': warnings}
if not res: if not res:
return {'result': 'success', 'value': '()'} return {'result': 'success', 'value': '()', 'warnings': warnings}
return {'result': 'error', 'value': res} return {'result': 'error', 'value': res, 'warnings': warnings}
def evaluate(self, statements): def evaluate(self, statements):
assert self.proc.is_running(), "carp process has died" assert self.proc.is_running(), "carp process has died"