From e53c6bba9bbdc265ca96396f979f0ad70598fa1c Mon Sep 17 00:00:00 2001 From: Paulo Henrique Silva Date: Tue, 17 Dec 2013 12:01:34 -0800 Subject: Initial commit --- .gitignore | 36 +++++++++++ LICENSE | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 2 + 3 files changed, 240 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE create mode 100644 README.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ded6067 --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +*.py[cod] + +# C extensions +*.so + +# Packages +*.egg +*.egg-info +dist +build +eggs +parts +bin +var +sdist +develop-eggs +.installed.cfg +lib +lib64 +__pycache__ + +# Installer logs +pip-log.txt + +# Unit test / coverage reports +.coverage +.tox +nosetests.xml + +# Translations +*.mo + +# Mr Developer +.mr.developer.cfg +.project +.pydevproject diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e06d208 --- /dev/null +++ b/LICENSE @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/README.md b/README.md new file mode 100644 index 0000000..31ca1d7 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +gerber-tools +============ -- cgit From c1518b5dfe7c5265ffa2df60598a0db223263ecb Mon Sep 17 00:00:00 2001 From: Paulo Henrique Silva Date: Tue, 17 Dec 2013 18:05:30 -0200 Subject: Working version of Gerber RS-274X parser. --- README.md | 7 ++++ gerber.md | 73 +++++++++++++++++++++++++++++++++++ gerber.py | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 209 insertions(+) create mode 100644 gerber.md create mode 100644 gerber.py diff --git a/README.md b/README.md index 31ca1d7..d929f94 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,9 @@ gerber-tools ============ + +This hopefully will be a useful set of tools to handle Gerber files in Python. + +Right now we have a working parser and I am working on simple Gerber to SVG converter. + +See gerber.md for some random information regardind Gerber format. + diff --git a/gerber.md b/gerber.md new file mode 100644 index 0000000..865d177 --- /dev/null +++ b/gerber.md @@ -0,0 +1,73 @@ + +# Gerber (RS-274X or Extended Gerber) is a bilevel, resolution independent image format. + +# // graphic objects +# // draw: line segment, thickness, round or square line endings. (solid circle and rectangule apertures only) +# // arc: circular arc, thickness, round endings. (solid circle standard aperture only) +# // flash: replication of a given apertura (shape) +# // region: are defined by a countour (linear/arc segments.) +# +# // draw/arc: can have zero length (just flash the aperture) +# // flash: any aperture can be flashed +# +# // operation codes operates on coordinate data blocks. each operation code is for one coordinate data block pair and vice-versa. +# // D01: stroke an aperture from current point to coordinate pair. region mode off. lights-on move. +# // D02: move current point to this coordinate pair +# // D03: flash current aperture at this coordinate pair. +# +# // graphics state +# // all state controlled by codes and parameters, except current point +# // +# // state fixed? initial value +# // coordinate format fixed undefined +# // unit fixed undefined +# // image polarity fixed positive +# // steps/repeat variable 1,1,-,- +# // level polarity variable dark +# // region mode variable off +# // current aperture variable undefined +# // quadrant mode variable undefined +# // interpolation mode variable undefined +# // current point variable (0,0) +# +# // attributes: metadata, both standard and custom. No change on image. +# +# // G01: linear +# // G04: comment +# // M02: end of file +# // D: select aperture +# // G75: multi quadrant mode (circles) +# // G36: region begin +# // G37: region end +# +# // [G01] [Xnnfffff] [Ynnffff] D01* +# +# // ASCII 32-126, CR LF. +# // * end-of-block +# // % parameer delimiter +# // , field separator +# // only in comments +# // case sensitive +# +# // int: +/- 32 bit signed +# // decimal: +/- digits +# // names: [a-zA-Z_$]{[a-zA-Z_$0-9]+} (255) +# // strings: [a-zA-Z0-9_+-/!?<>”’(){}.\|&@# ]+ (65535) +# +# // data block: end in * +# // statement: one or more data block, if contain parameters starts and end in % (parameter statement) +# // statement: [%]{}[%] +# // statements: function code, coordinate data, parameters +# +# // function code: operation codes (D01..) or code that set state. +# // function codes applies before operation codes act on coordinates +# +# // coordinate data: : [X][Y][I][J](D01|D02|D03) +# // offsets are not modal +# +# // parameter: %Parameter code[optional modifiers]*% +# // code: 2 characters +# +# // parameters can have line separators: %{{}}% +# +# // function code: (GDM){1}[number], parameters: [AZ]{2} \ No newline at end of file diff --git a/gerber.py b/gerber.py new file mode 100644 index 0000000..74da114 --- /dev/null +++ b/gerber.py @@ -0,0 +1,129 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import re + +def red(s): + return '\033[1;31m{0}\033[0;m'.format(s) + +class Statement: + pass + +class ParamStmt(Statement): + pass + +class CoordStmt(Statement): + pass + +class ApertureStmt(Statement): + pass + +class CommentStmt(Statement): + def __init__(self, comment): + self.comment = comment + +class EofStmt(Statement): + pass + +class UnexpectedStmt(Statement): + def __init__(self, line): + self.line = line + +class GerberContext: + x = 0 + y = 0 + +class Gerber: + NUMBER = r"[\+-]?\d+" + FUNCTION = r"G\d{2}" + STRING = r"[a-zA-Z0-9_+-/!?<>”’(){}.\|&@# :]+" + + COORD_OP = r"D[0]?[123]" + + PARAM_STMT = re.compile(r"%.*%") + + COORD_STMT = re.compile(( + r"(?P{f})?" + r"(X(?P{number}))?(Y(?P{number}))?" + r"(I(?P{number}))?(J(?P{number}))?" + r"(?P{op})?\*".format(number=NUMBER, f=FUNCTION, op=COORD_OP))) + + APERTURE_STMT = re.compile(r"(G54)?D\d+\*") + + COMMENT_STMT = re.compile(r"G04(?P{string})\*".format(string=STRING)) + + EOF_STMT = re.compile(r"M02\*") + + def __init__(self): + self.apertures = {} + self.ctx = GerberContext() + + def parse(self, filename): + + fp = open(filename, "r") + data = fp.readlines() + + self.tokens = list(self.tokenize(data)) + for token in self.tokens: + if isinstance(token, UnexpectedStmt): + print filename + print red("[UNEXPECTED TOKEN]") + print self.COORD_STMT.pattern + print token.line + + def tokenize(self, data): + multiline = None + + for i, line in enumerate(data): + # remove EOL + if multiline: + line = multiline + line.strip() + else: + line = line.strip() + + # deal with multi-line parameters + if line.startswith("%") and not line.endswith("%"): + multiline = line + continue + else: + multiline = None + + # parameter + match = self.PARAM_STMT.match(line) + if match: + yield ParamStmt() + continue + + # coord + matches = self.COORD_STMT.finditer(line) + if matches: + for match in matches: + yield CoordStmt() + continue + + # aperture selection + match = self.APERTURE_STMT.match(line) + if match: + yield ApertureStmt() + continue + + # comment + match = self.COMMENT_STMT.match(line) + if match: + yield CommentStmt(match.groupdict("comment")) + continue + + # eof + match = self.EOF_STMT.match(line) + if match: + yield EofStmt() + continue + + yield UnexpectedStmt(line) + +if __name__ == "__main__": + import sys + + for f in sys.argv[1:]: + g = Gerber() + g.parse(f) -- cgit From 6aa1c0567d298dc14fa4ac51fd430d329f95d920 Mon Sep 17 00:00:00 2001 From: Paulo Henrique Silva Date: Wed, 18 Dec 2013 02:57:11 -0200 Subject: Make gerber package --- gerber.py | 129 ----------------------------------------------------- gerber/__init__.py | 0 gerber/gerber.py | 129 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 129 insertions(+), 129 deletions(-) delete mode 100644 gerber.py create mode 100644 gerber/__init__.py create mode 100644 gerber/gerber.py diff --git a/gerber.py b/gerber.py deleted file mode 100644 index 74da114..0000000 --- a/gerber.py +++ /dev/null @@ -1,129 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -import re - -def red(s): - return '\033[1;31m{0}\033[0;m'.format(s) - -class Statement: - pass - -class ParamStmt(Statement): - pass - -class CoordStmt(Statement): - pass - -class ApertureStmt(Statement): - pass - -class CommentStmt(Statement): - def __init__(self, comment): - self.comment = comment - -class EofStmt(Statement): - pass - -class UnexpectedStmt(Statement): - def __init__(self, line): - self.line = line - -class GerberContext: - x = 0 - y = 0 - -class Gerber: - NUMBER = r"[\+-]?\d+" - FUNCTION = r"G\d{2}" - STRING = r"[a-zA-Z0-9_+-/!?<>”’(){}.\|&@# :]+" - - COORD_OP = r"D[0]?[123]" - - PARAM_STMT = re.compile(r"%.*%") - - COORD_STMT = re.compile(( - r"(?P{f})?" - r"(X(?P{number}))?(Y(?P{number}))?" - r"(I(?P{number}))?(J(?P{number}))?" - r"(?P{op})?\*".format(number=NUMBER, f=FUNCTION, op=COORD_OP))) - - APERTURE_STMT = re.compile(r"(G54)?D\d+\*") - - COMMENT_STMT = re.compile(r"G04(?P{string})\*".format(string=STRING)) - - EOF_STMT = re.compile(r"M02\*") - - def __init__(self): - self.apertures = {} - self.ctx = GerberContext() - - def parse(self, filename): - - fp = open(filename, "r") - data = fp.readlines() - - self.tokens = list(self.tokenize(data)) - for token in self.tokens: - if isinstance(token, UnexpectedStmt): - print filename - print red("[UNEXPECTED TOKEN]") - print self.COORD_STMT.pattern - print token.line - - def tokenize(self, data): - multiline = None - - for i, line in enumerate(data): - # remove EOL - if multiline: - line = multiline + line.strip() - else: - line = line.strip() - - # deal with multi-line parameters - if line.startswith("%") and not line.endswith("%"): - multiline = line - continue - else: - multiline = None - - # parameter - match = self.PARAM_STMT.match(line) - if match: - yield ParamStmt() - continue - - # coord - matches = self.COORD_STMT.finditer(line) - if matches: - for match in matches: - yield CoordStmt() - continue - - # aperture selection - match = self.APERTURE_STMT.match(line) - if match: - yield ApertureStmt() - continue - - # comment - match = self.COMMENT_STMT.match(line) - if match: - yield CommentStmt(match.groupdict("comment")) - continue - - # eof - match = self.EOF_STMT.match(line) - if match: - yield EofStmt() - continue - - yield UnexpectedStmt(line) - -if __name__ == "__main__": - import sys - - for f in sys.argv[1:]: - g = Gerber() - g.parse(f) diff --git a/gerber/__init__.py b/gerber/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/gerber/gerber.py b/gerber/gerber.py new file mode 100644 index 0000000..74da114 --- /dev/null +++ b/gerber/gerber.py @@ -0,0 +1,129 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import re + +def red(s): + return '\033[1;31m{0}\033[0;m'.format(s) + +class Statement: + pass + +class ParamStmt(Statement): + pass + +class CoordStmt(Statement): + pass + +class ApertureStmt(Statement): + pass + +class CommentStmt(Statement): + def __init__(self, comment): + self.comment = comment + +class EofStmt(Statement): + pass + +class UnexpectedStmt(Statement): + def __init__(self, line): + self.line = line + +class GerberContext: + x = 0 + y = 0 + +class Gerber: + NUMBER = r"[\+-]?\d+" + FUNCTION = r"G\d{2}" + STRING = r"[a-zA-Z0-9_+-/!?<>”’(){}.\|&@# :]+" + + COORD_OP = r"D[0]?[123]" + + PARAM_STMT = re.compile(r"%.*%") + + COORD_STMT = re.compile(( + r"(?P{f})?" + r"(X(?P{number}))?(Y(?P{number}))?" + r"(I(?P{number}))?(J(?P{number}))?" + r"(?P{op})?\*".format(number=NUMBER, f=FUNCTION, op=COORD_OP))) + + APERTURE_STMT = re.compile(r"(G54)?D\d+\*") + + COMMENT_STMT = re.compile(r"G04(?P{string})\*".format(string=STRING)) + + EOF_STMT = re.compile(r"M02\*") + + def __init__(self): + self.apertures = {} + self.ctx = GerberContext() + + def parse(self, filename): + + fp = open(filename, "r") + data = fp.readlines() + + self.tokens = list(self.tokenize(data)) + for token in self.tokens: + if isinstance(token, UnexpectedStmt): + print filename + print red("[UNEXPECTED TOKEN]") + print self.COORD_STMT.pattern + print token.line + + def tokenize(self, data): + multiline = None + + for i, line in enumerate(data): + # remove EOL + if multiline: + line = multiline + line.strip() + else: + line = line.strip() + + # deal with multi-line parameters + if line.startswith("%") and not line.endswith("%"): + multiline = line + continue + else: + multiline = None + + # parameter + match = self.PARAM_STMT.match(line) + if match: + yield ParamStmt() + continue + + # coord + matches = self.COORD_STMT.finditer(line) + if matches: + for match in matches: + yield CoordStmt() + continue + + # aperture selection + match = self.APERTURE_STMT.match(line) + if match: + yield ApertureStmt() + continue + + # comment + match = self.COMMENT_STMT.match(line) + if match: + yield CommentStmt(match.groupdict("comment")) + continue + + # eof + match = self.EOF_STMT.match(line) + if match: + yield EofStmt() + continue + + yield UnexpectedStmt(line) + +if __name__ == "__main__": + import sys + + for f in sys.argv[1:]: + g = Gerber() + g.parse(f) -- cgit From 6b8f0470e9460dfc70ae8b7714f6e2659dedcdc2 Mon Sep 17 00:00:00 2001 From: Paulo Henrique Silva Date: Wed, 18 Dec 2013 02:58:11 -0200 Subject: Add PyCharm project --- .gitignore | 1 + .idea/.name | 1 + .idea/encodings.xml | 5 +++++ .idea/gerber-tools.iml | 16 ++++++++++++++++ .idea/misc.xml | 27 +++++++++++++++++++++++++++ .idea/modules.xml | 9 +++++++++ .idea/scopes/scope_settings.xml | 5 +++++ .idea/vcs.xml | 7 +++++++ 8 files changed, 71 insertions(+) create mode 100644 .idea/.name create mode 100644 .idea/encodings.xml create mode 100644 .idea/gerber-tools.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/scopes/scope_settings.xml create mode 100644 .idea/vcs.xml diff --git a/.gitignore b/.gitignore index ded6067..407910f 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ nosetests.xml .mr.developer.cfg .project .pydevproject +.idea/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..0f4aea0 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +gerber-tools \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..e206d70 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/gerber-tools.iml b/.idea/gerber-tools.iml new file mode 100644 index 0000000..18de24d --- /dev/null +++ b/.idea/gerber-tools.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..26db776 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..f18c125 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..c80f219 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + -- cgit From 560a68eeb929a3f9310a7aab0656dbc9b307e417 Mon Sep 17 00:00:00 2001 From: Paulo Henrique Silva Date: Wed, 18 Dec 2013 03:01:03 -0200 Subject: Make PEP-8 clean. --- gerber/gerber.py | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/gerber/gerber.py b/gerber/gerber.py index 74da114..d3f1ff1 100644 --- a/gerber/gerber.py +++ b/gerber/gerber.py @@ -3,38 +3,47 @@ import re + def red(s): return '\033[1;31m{0}\033[0;m'.format(s) + class Statement: - pass + def __init__(self): + pass + class ParamStmt(Statement): - pass + def __init__(self): + pass + class CoordStmt(Statement): - pass + def __init__(self): + pass + class ApertureStmt(Statement): - pass + def __init__(self): + pass + class CommentStmt(Statement): def __init__(self, comment): self.comment = comment + class EofStmt(Statement): pass + class UnexpectedStmt(Statement): def __init__(self, line): self.line = line -class GerberContext: - x = 0 - y = 0 class Gerber: - NUMBER = r"[\+-]?\d+" + NUMBER = r"[\+-]?\d+" FUNCTION = r"G\d{2}" STRING = r"[a-zA-Z0-9_+-/!?<>”’(){}.\|&@# :]+" @@ -55,20 +64,17 @@ class Gerber: EOF_STMT = re.compile(r"M02\*") def __init__(self): - self.apertures = {} - self.ctx = GerberContext() + self.tokens = [] def parse(self, filename): - fp = open(filename, "r") data = fp.readlines() self.tokens = list(self.tokenize(data)) + for token in self.tokens: if isinstance(token, UnexpectedStmt): - print filename print red("[UNEXPECTED TOKEN]") - print self.COORD_STMT.pattern print token.line def tokenize(self, data): -- cgit From b88e242625349731e653f24892876923ffc48184 Mon Sep 17 00:00:00 2001 From: Paulo Henrique Silva Date: Wed, 18 Dec 2013 03:22:56 -0200 Subject: Configure Epytext as default docstring formatter. --- .idea/gerber-tools.iml | 2 +- .idea/misc.xml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.idea/gerber-tools.iml b/.idea/gerber-tools.iml index 18de24d..568a565 100644 --- a/.idea/gerber-tools.iml +++ b/.idea/gerber-tools.iml @@ -6,7 +6,7 @@ -