summaryrefslogtreecommitdiff
path: root/gerber
diff options
context:
space:
mode:
authorGarret Fick <garret@fickworkshop.com>2016-03-27 14:37:46 +0800
committerGarret Fick <garret@fickworkshop.com>2016-03-27 14:37:46 +0800
commitad29fac87358a43f50357580e705fc389f02c1ad (patch)
tree33a1ee712abc7489f3dff4ca7907c53de1e4c4d9 /gerber
parent288f49955ecc1a811752aa4b1e713f9954e3033b (diff)
parent738bbc7edda0d8006ef4ff8159144ff3cf03d3ba (diff)
downloadgerbonara-ad29fac87358a43f50357580e705fc389f02c1ad.tar.gz
gerbonara-ad29fac87358a43f50357580e705fc389f02c1ad.tar.bz2
gerbonara-ad29fac87358a43f50357580e705fc389f02c1ad.zip
Merge pull request #2 from qaulau/master
Update rs274x.py
Diffstat (limited to 'gerber')
-rw-r--r--gerber/rs274x.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/gerber/rs274x.py b/gerber/rs274x.py
index 2cfef87..7b3a3b9 100644
--- a/gerber/rs274x.py
+++ b/gerber/rs274x.py
@@ -168,11 +168,11 @@ class GerberParser(object):
FS = r"(?P<param>FS)(?P<zero>(L|T|D))?(?P<notation>(A|I))X(?P<x>[0-7][0-7])Y(?P<y>[0-7][0-7])"
MO = r"(?P<param>MO)(?P<mo>(MM|IN))"
LP = r"(?P<param>LP)(?P<lp>(D|C))"
- AD_CIRCLE = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>C)[,]?(?P<modifiers>[^,%]*)?"
+ AD_CIRCLE = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>C)[,]?(?P<modifiers>[^,%]*)"
AD_RECT = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>R)[,](?P<modifiers>[^,%]*)"
AD_OBROUND = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>O)[,](?P<modifiers>[^,%]*)"
AD_POLY = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>P)[,](?P<modifiers>[^,%]*)"
- AD_MACRO = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>{name})[,]?(?P<modifiers>[^,%]*)?".format(name=NAME)
+ AD_MACRO = r"(?P<param>AD)D(?P<d>\d+)(?P<shape>{name})[,]?(?P<modifiers>[^,%]*)".format(name=NAME)
AM = r"(?P<param>AM)(?P<name>{name})\*(?P<macro>[^%]*)".format(name=NAME)
# begin deprecated