Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-09 05:46:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow optional second arguments to substr formatting.

Browse Source
This commit is contained in:
Dion Moult
2023-09-12 17:47:35 +10:00
parent cb264bac6e
commit cc1a2db3ff
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/util/selector.py
+7 -2
View File
@@ -128,7 +128,7 @@ format_grammar = lark.Lark(
upper: "upper(" function ")" upper: "upper(" function ")"
title: "title(" function ")" title: "title(" function ")"
concat: "concat(" function ("," function)* ")" concat: "concat(" function ("," function)* ")"
substr: "substr(" function "," SIGNED_INT "," SIGNED_INT ")" substr: "substr(" function "," SIGNED_INT ["," SIGNED_INT] ")"
// Embed common.lark for packaging // Embed common.lark for packaging
DIGIT: "0".."9" DIGIT: "0".."9"
@@ -186,7 +186,12 @@ class FormatTransformer(lark.Transformer):
return "".join(args) return "".join(args)
def substr(self, args): def substr(self, args):
return str(args[0])[int(args[1]) : int(args[2])] if len(args) == 3:
if args[2] is None:
return str(args[0])[int(args[1]) :]
return str(args[0])[int(args[1]) : int(args[2])]
elif len(args) == 2:
return str(args[0])[int(args[1]) :]
def round(self, args): def round(self, args):
value = Decimal(args[0] or 0.0) value = Decimal(args[0] or 0.0)