jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small fixes to the relative import fix.

Browse source 
-- Now the tests actually runs
  -- Corrected the syntax for the fix in the yacc file
This commit is contained in:
Johan Hake 2014-09-29 17:37:41 +02:00
commit de4f30bd3c
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Examples/python/import_packages/Makefile
View file

@ -11,7 +11,8 @@ import_packages_subdirs = \
from_init2 \ from_init2 \
from_init3 \ from_init3 \
relativeimport1 \ relativeimport1 \
relativeimport1 relativeimport2 \
relativeimport3
check: build check: build
if test "x$(SRCDIR)" != x; then \ if test "x$(SRCDIR)" != x; then \

2
Source/CParse/parser.y
View file

@ -1880,7 +1880,7 @@ include_directive: includetype options string BEGINFILE {
Node *nint = new_node("import"); Node *nint = new_node("import");
Node *mnode = new_node("module"); Node *mnode = new_node("module");
Setattr(mnode,"name", mname); Setattr(mnode,"name", mname);
Setattr(mnode,"options",(yyvsp[-5].node)); Setattr(mnode,"options",$2);
appendChild(nint,mnode); appendChild(nint,mnode);
Delete(mnode); Delete(mnode);
appendChild(nint,firstChild($$)); appendChild(nint,firstChild($$));