lang: Add module imports and more
This enables imports in mcl code, and is one of last remaining blockers to using mgmt. Now we can start writing standalone modules, and adding standard library functions as needed. There's still lots to do, but this was a big missing piece. It was much harder to get right than I had expected, but I think it's solid! This unfortunately large commit is the result of some wild hacking I've been doing for the past little while. It's the result of a rebase that broke many "wip" commits that tracked my private progress, into something that's not gratuitously messy for our git logs. Since this was a learning and discovery process for me, I've "erased" the confusing git history that wouldn't have helped. I'm happy to discuss the dead-ends, and a small portion of that code was even left in for possible future use. This patch includes: * A change to the cli interface: You now specify the front-end explicitly, instead of leaving it up to the front-end to decide when to "activate". For example, instead of: mgmt run --lang code.mcl we now do: mgmt run lang --lang code.mcl We might rename the --lang flag in the future to avoid the awkward word repetition. Suggestions welcome, but I'm considering "input". One side-effect of this change, is that flags which are "engine" specific now must be specified with "run" before the front-end name. Eg: mgmt run --tmp-prefix lang --lang code.mcl instead of putting --tmp-prefix at the end. We also changed the GAPI slightly, but I've patched all code that used it. This also makes things consistent with the "deploy" command. * The deploys are more robust and let you deploy after a run This has been vastly improved and let's mgmt really run as a smart engine that can handle different workloads. If you don't want to deploy when you've started with `run` or if one comes in, you can use the --no-watch-deploy option to block new deploys. * The import statement exists and works! We now have a working `import` statement. Read the docs, and try it out. I think it's quite elegant how it fits in with `SetScope`. Have a look. As a result, we now have some built-in functions available in modules. This also adds the metadata.yaml entry-point for all modules. Have a look at the examples or the tests. The bulk of the patch is to support this. * Improved lang input parsing code: I re-wrote the parsing that determined what ran when we passed different things to --lang. Deciding between running an mcl file or raw code is now handled in a more intelligent, and re-usable way. See the inputs.go file if you want to have a look. One casualty is that you can't stream code from stdin *directly* to the front-end, it's encapsulated into a deploy first. You can still use stdin though! I doubt anyone will notice this change. * The scope was extended to include functions and classes: Go forth and import lovely code. All these exist in scopes now, and can be re-used! * Function calls actually use the scope now. Glad I got this sorted out. * There is import cycle detection for modules! Yes, this is another dag. I think that's #4. I guess they're useful. * A ton of tests and new test infra was added! This should make it much easier to add new tests that run mcl code. Have a look at TestAstFunc1 to see how to add more of these. As usual, I'll try to keep these commits smaller in the future!
This commit is contained in:
33
util/util.go
33
util/util.go
@@ -364,10 +364,13 @@ func RemoveBasePath(path, base string) (string, error) {
|
||||
}
|
||||
|
||||
// Rebase takes an absolute base path (directory prefix) and removes it from an
|
||||
// absolute path and then returns that path with a new root as an absolute path.
|
||||
// absolute path and then returns that path with a new root as an absolute path
|
||||
// if root is an absolute dir, and as a relative path if root is a relative dir.
|
||||
// Eg: Rebase("/usr/bin/foo", "/usr/", "/usr/local/") -> "/usr/local/bin/foo"
|
||||
// Eg: Rebase("/var/lib/dir/file.conf", "/var/lib/", "") -> "dir/file.conf"
|
||||
func Rebase(path, base, root string) (string, error) {
|
||||
if !strings.HasSuffix(root, "/") { // should end with a slash
|
||||
// allow empty root's to rebase into a relative path if not a directory!
|
||||
if root != "" && !strings.HasSuffix(root, "/") { // should end with a slash
|
||||
return "", fmt.Errorf("root is not a directory")
|
||||
}
|
||||
s, err := RemoveBasePath(path, base)
|
||||
@@ -377,6 +380,23 @@ func Rebase(path, base, root string) (string, error) {
|
||||
return root + s, nil
|
||||
}
|
||||
|
||||
// RemovePathPrefix takes an absolute path and removes the first chunk. It
|
||||
// returns the remainder as an absolute path. This function is a bit of a hack,
|
||||
// and could probably be re-written to support any kind of path, and return a
|
||||
// relative path.
|
||||
func RemovePathPrefix(s string) (string, error) {
|
||||
if !strings.HasPrefix(s, "/") {
|
||||
return "", fmt.Errorf("must be absolute")
|
||||
}
|
||||
// this is the PathSplit logic...
|
||||
x := []string{""} // assumes s == "/"
|
||||
if s != "/" {
|
||||
x = strings.Split(s, "/")
|
||||
}
|
||||
x = x[2:] // get rid of first two chunks, first is / and second is a dir name
|
||||
return "/" + strings.Join(x, "/"), nil
|
||||
}
|
||||
|
||||
// TimeAfterOrBlock is aspecial version of time.After that blocks when given a
|
||||
// negative integer. When used in a case statement, the timer restarts on each
|
||||
// select call to it.
|
||||
@@ -484,6 +504,9 @@ func (obj PathSlice) Less(i, j int) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
// Sort is a convenience method.
|
||||
func (obj PathSlice) Sort() { sort.Sort(obj) }
|
||||
|
||||
// UInt64Slice attaches the methods of sort.Interface to []uint64, sorting in
|
||||
// increasing order.
|
||||
type UInt64Slice []uint64
|
||||
@@ -491,12 +514,12 @@ type UInt64Slice []uint64
|
||||
// Len returns the length of the slice of uint64's.
|
||||
func (obj UInt64Slice) Len() int { return len(obj) }
|
||||
|
||||
// Less returns the smaller element in the sort order.
|
||||
func (obj UInt64Slice) Less(i, j int) bool { return obj[i] < obj[j] }
|
||||
|
||||
// Swap swaps two elements in the slice.
|
||||
func (obj UInt64Slice) Swap(i, j int) { obj[i], obj[j] = obj[j], obj[i] }
|
||||
|
||||
// Less returns the smaller element in the sort order.
|
||||
func (obj UInt64Slice) Less(i, j int) bool { return obj[i] < obj[j] }
|
||||
|
||||
// Sort is a convenience method.
|
||||
func (obj UInt64Slice) Sort() { sort.Sort(obj) }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user