Skip to content

conslidated maui's changes into fcad and made them a seperate repo #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tapegoji wants to merge 1 commit into
base: master
Choose a base branch
from
Open

conslidated maui's changes into fcad and made them a seperate repo #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions sexp_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@
import bisect
from collections import OrderedDict

# import importlib; from fcad_parser import sexp_parser;import importlib; importlib.reload(sexp_parser)
# kicad sexparser board file version log
# https://docs.kicad.org/doxygen/pcb__io__kicad__sexpr_8h_source.html

__author__ = "Zheng, Lei"
__copyright__ = "Copyright 2016, Zheng, Lei"
__license__ = "MIT"
__version__ = "1.0.0"
__version__ = "1.0.2"
__email__ = "realthunder.dev@gmail.com"
__status__ = "Prototype"

Expand All @@ -38,6 +42,7 @@
string_types = basestring,

logger = logging.getLogger(__name__)
#logger.setLevel(logging.DEBUG)

def unquote(s):
try:
Expand Down Expand Up @@ -143,6 +148,7 @@ def __len__(self):
return 0

def __getitem__(self,key):
# print(key,'maui') #maui test workaround
v = self._value[key]
p = getattr(v,'__get__',None)
return v if p is None else p(self,self.__class__)
Expand Down Expand Up @@ -171,6 +177,7 @@ def __str__(self):

def __getattr__(self,name):
try:
# print(name,'maui') #maui test workaround
if not name.startswith('_'):
return self.__getitem__(name)
except KeyError:
Expand Down Expand Up @@ -598,7 +605,11 @@ class SexpDefaultTrue(Sexp):

def __init__(self,data,value=True):
if not isinstance(data,string_types):
raise ValueError('invalid boolean data')
if not isinstance(data,list): # maui
raise ValueError('invalid boolean data')
else: # maui
value=data[1]
data=data[0]
super(SexpDefaultTrue,self).__init__(data,value)

def __nonzero__(self):
Expand Down Expand Up @@ -757,10 +768,18 @@ def parseSexp(sexp, quote_no_parse=None):
count = 0
if isinstance(sexp,string_types):
sexp = sexp.splitlines(False)
sexpb=[] # maui
for l in iter(sexp):
count += len(l)
lines.append(count)
sexp = ''.join(sexp)
if '(property' in l:
if '\\\\' in l: #maui removing backslash on values
#l=re.sub('\\\\','/',l)
l=l.replace('\\\\','/')
sexpb.append(l)

sexp = ''.join(sexpb)
#sexp = ''.join(sexp) # maui end

regex = _sexp_regex

Expand Down Expand Up @@ -788,6 +807,7 @@ def parseSexp(sexp, quote_no_parse=None):
term, value = [(t,v) for t,v in termtypes.groupdict().items() if v][0]
if logger.isEnabledFor(logging.DEBUG):
logging.debug("%-7s %-14s %-44r %-r" % (term, value, out, stack))
#print("%-7s %-14s %-44r %-r" % (term, value, out, stack))
if term == 'l': # left bracket
pos = termtypes.start()
stack.append(out)
Expand All @@ -802,6 +822,9 @@ def parseSexp(sexp, quote_no_parse=None):
out.append(bisect.bisect_right(lines,termtypes.start())+1)
if term == 'q': # quoted string
# out.append(value[1:-1]) # strip quotes
#value=re.sub(b"\\\\\\",b"/",value)
#value=re.sub(b"\\\\",b"/",value)
#print('value',value)
out.append(value) # do not strip quotes
elif term == 's': # simple string
if value and len(out) == 1:
Expand Down Expand Up @@ -834,4 +857,3 @@ def exportSexp(sexp, out, prefix='', indent=' '):
def getSexpError(sexp):
p = getattr(sexp,'_getError',None)
return p()

Loading