From de4f30bd3c45709143f557a12038c022ca42a683 Mon Sep 17 00:00:00 2001 From: Johan Hake Date: Mon, 29 Sep 2014 17:37:41 +0200 Subject: [PATCH] Small fixes to the relative import fix. -- Now the tests actually runs -- Corrected the syntax for the fix in the yacc file --- Examples/python/import_packages/Makefile | 3 ++- Source/CParse/parser.y | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Examples/python/import_packages/Makefile b/Examples/python/import_packages/Makefile index d5054fd22..dfd46d05c 100644 --- a/Examples/python/import_packages/Makefile +++ b/Examples/python/import_packages/Makefile @@ -11,7 +11,8 @@ import_packages_subdirs = \ from_init2 \ from_init3 \ relativeimport1 \ - relativeimport1 + relativeimport2 \ + relativeimport3 check: build if test "x$(SRCDIR)" != x; then \ diff --git a/Source/CParse/parser.y b/Source/CParse/parser.y index ec0927536..b334ace76 100644 --- a/Source/CParse/parser.y +++ b/Source/CParse/parser.y @@ -1880,7 +1880,7 @@ include_directive: includetype options string BEGINFILE { Node *nint = new_node("import"); Node *mnode = new_node("module"); Setattr(mnode,"name", mname); - Setattr(mnode,"options",(yyvsp[-5].node)); + Setattr(mnode,"options",$2); appendChild(nint,mnode); Delete(mnode); appendChild(nint,firstChild($$));