lang: funcs: core: Allow nested system imports

We were passing the wrong module name for system imports. This is now
fixed, includes an example, and some tests!

lang/funcs/core/core.go

@@ -21,6 +21,7 @@ import (
 	// import so the funcs register
 	_ "github.com/purpleidea/mgmt/lang/funcs/core/datetime"
 	_ "github.com/purpleidea/mgmt/lang/funcs/core/example"
+	_ "github.com/purpleidea/mgmt/lang/funcs/core/example/nested"
 	_ "github.com/purpleidea/mgmt/lang/funcs/core/fmt"
 	_ "github.com/purpleidea/mgmt/lang/funcs/core/math"
 	_ "github.com/purpleidea/mgmt/lang/funcs/core/os"

lang/funcs/core/example/nested/hello_func.go

@@ -0,0 +1,38 @@
+// Mgmt
+// Copyright (C) 2013-2019+ James Shubin and the project contributors
+// Written by James Shubin <james@shubin.ca> and the project contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package corenested
+
+import (
+	coreexample "github.com/purpleidea/mgmt/lang/funcs/core/example"
+	"github.com/purpleidea/mgmt/lang/funcs/simple"
+	"github.com/purpleidea/mgmt/lang/types"
+)
+
+func init() {
+	simple.ModuleRegister(coreexample.ModuleName+"/"+ModuleName, "hello", &types.FuncValue{
+		T: types.NewType("func() str"),
+		V: Hello,
+	})
+}
+
+// Hello returns some string. This is just to test nesting.
+func Hello(input []types.Value) (types.Value, error) {
+	return &types.StrValue{
+		V: "Hello!",
+	}, nil
+}

lang/funcs/core/example/nested/nested.go

@@ -0,0 +1,23 @@
+// Mgmt
+// Copyright (C) 2013-2019+ James Shubin and the project contributors
+// Written by James Shubin <james@shubin.ca> and the project contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package corenested
+
+const (
+	// ModuleName is the prefix given to all the functions in this module.
+	ModuleName = "nested"
+)

lang/funcs/core/template_func.go

@@ -333,6 +333,7 @@ func safename(name string) string {
 	// TODO: should we pick a different replacement char?
 	char := funcs.ReplaceChar // can't be any of: .-#
 	result := strings.Replace(name, funcs.ModuleSep, char, -1)
+	result = strings.Replace(result, "/", char, -1) // nested imports
 	if result == name {
 		// No change, so add a prefix for package-less functions... This
 		// prevents conflicts from sys.func1 -> sys_func1 which would be

lang/interpret_test/TestAstFunc2/nested-import0.output

@@ -0,0 +1 @@
+Vertex: test[Hello!]

lang/interpret_test/TestAstFunc2/nested-import0/main.mcl

@@ -0,0 +1,5 @@
+import "example/nested"
+
+$x = nested.hello()
+
+test $x {}

lang/interpret_test/TestAstFunc2/nested-import1.output

@@ -0,0 +1 @@
+Vertex: test[Hello!]

lang/interpret_test/TestAstFunc2/nested-import1/main.mcl

@@ -0,0 +1,5 @@
+import "example/nested" as foo
+
+$x = foo.hello()
+
+test $x {}

lang/structs.go

@@ -2072,9 +2072,9 @@ func (obj *StmtProg) importScope(info *interfaces.ImportData, scope *interfaces.
 	// but recursive imports mean this is not always the active file...
 
 	if info.IsSystem { // system imports are the exact name, eg "fmt"
-		systemScope, err := obj.importSystemScope(info.Alias)
+		systemScope, err := obj.importSystemScope(info.Name)
 		if err != nil {
-			return nil, errwrap.Wrapf(err, "system import of `%s` failed", info.Alias)
+			return nil, errwrap.Wrapf(err, "system import of `%s` failed", info.Name)
 		}
 		return systemScope, nil
 	}