go: update to ubuntu:24.04 and convert to go.mod style

kanaka · Aug 5, 2024 · a683fdb · a683fdb
1 parent e4a92b1
commit a683fdb
Show file tree

Hide file tree

Showing 17 changed files with 69 additions and 68 deletions.
diff --git a/impls/go/Dockerfile b/impls/go/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 MAINTAINER Joel Martin <[email protected]>
 
 ##########################################################
@@ -19,4 +19,7 @@ WORKDIR /mal
 # Specific implementation requirements
 ##########################################################
 
-RUN DEBIAN_FRONTEND=noninteractive apt-get -y install g++ golang libedit-dev pkg-config
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install g++ golang libreadline-dev libedit-dev pkg-config
+
+ENV HOME /mal
+ENV GOPATH /mal/impls/go/
diff --git a/impls/go/Makefile b/impls/go/Makefile
@@ -1,5 +1,3 @@
-export GOPATH := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-
 #####################
 
 SOURCES_BASE = src/types/types.go src/readline/readline.go \
@@ -24,7 +22,7 @@ mal: $(word $(words $(BINS)),$(BINS))
 
 define dep_template
 $(1): $(SOURCES_BASE) src/$(1)/$(1).go
-	go build $$@
+	go build -o $$@ ./src/$(1)
 endef
 
 $(foreach b,$(BINS),$(eval $(call dep_template,$(b))))

diff --git a/impls/go/src/core/core.go b/impls/go/src/core/core.go
@@ -9,10 +9,10 @@ import (
 )
 
 import (
-	"printer"
-	"reader"
-	"readline"
-	. "types"
+	"mal/src/printer"
+	"mal/src/reader"
+	"mal/src/readline"
+	. "mal/src/types"
 )
 
 // Errors/Exceptions

diff --git a/impls/go/src/env/env.go b/impls/go/src/env/env.go
@@ -6,7 +6,7 @@ import (
 )
 
 import (
-	. "types"
+	. "mal/src/types"
 )
 
 type Env struct {

diff --git a/impls/go/src/printer/printer.go b/impls/go/src/printer/printer.go
@@ -6,7 +6,7 @@ import (
 )
 
 import (
-	"types"
+	"mal/src/types"
 )
 
 func Pr_list(lst []types.MalType, pr bool,

diff --git a/impls/go/src/reader/reader.go b/impls/go/src/reader/reader.go
@@ -9,7 +9,7 @@ import (
 )
 
 import (
-	. "types"
+	. "mal/src/types"
 )
 
 type Reader interface {

diff --git a/impls/go/src/step0_repl/step0_repl.go b/impls/go/src/step0_repl/step0_repl.go
@@ -6,7 +6,7 @@ import (
 )
 
 import (
-	"readline"
+	"mal/src/readline"
 )
 
 // read

diff --git a/impls/go/src/step1_read_print/step1_read_print.go b/impls/go/src/step1_read_print/step1_read_print.go
@@ -6,10 +6,10 @@ import (
 )
 
 import (
-	"printer"
-	"reader"
-	"readline"
-	. "types"
+	"mal/src/printer"
+	"mal/src/reader"
+	"mal/src/readline"
+	. "mal/src/types"
 )
 
 // read

diff --git a/impls/go/src/step2_eval/step2_eval.go b/impls/go/src/step2_eval/step2_eval.go
@@ -7,10 +7,10 @@ import (
 )
 
 import (
-	"printer"
-	"reader"
-	"readline"
-	. "types"
+	"mal/src/printer"
+	"mal/src/reader"
+	"mal/src/readline"
+	. "mal/src/types"
 )
 
 // read

diff --git a/impls/go/src/step3_env/step3_env.go b/impls/go/src/step3_env/step3_env.go
@@ -7,11 +7,11 @@ import (
 )
 
 import (
-	. "env"
-	"printer"
-	"reader"
-	"readline"
-	. "types"
+	. "mal/src/env"
+	"mal/src/printer"
+	"mal/src/reader"
+	"mal/src/readline"
+	. "mal/src/types"
 )
 
 // read

diff --git a/impls/go/src/step4_if_fn_do/step4_if_fn_do.go b/impls/go/src/step4_if_fn_do/step4_if_fn_do.go
@@ -7,12 +7,12 @@ import (
 )
 
 import (
-	"core"
-	. "env"
-	"printer"
-	"reader"
-	"readline"
-	. "types"
+	"mal/src/core"
+	. "mal/src/env"
+	"mal/src/printer"
+	"mal/src/reader"
+	"mal/src/readline"
+	. "mal/src/types"
 )
 
 // read

diff --git a/impls/go/src/step5_tco/step5_tco.go b/impls/go/src/step5_tco/step5_tco.go
@@ -7,12 +7,12 @@ import (
 )
 
 import (
-	"core"
-	. "env"
-	"printer"
-	"reader"
-	"readline"
-	. "types"
+	"mal/src/core"
+	. "mal/src/env"
+	"mal/src/printer"
+	"mal/src/reader"
+	"mal/src/readline"
+	. "mal/src/types"
 )
 
 // read

diff --git a/impls/go/src/step6_file/step6_file.go b/impls/go/src/step6_file/step6_file.go
@@ -8,12 +8,12 @@ import (
 )
 
 import (
-	"core"
-	. "env"
-	"printer"
-	"reader"
-	"readline"
-	. "types"
+	"mal/src/core"
+	. "mal/src/env"
+	"mal/src/printer"
+	"mal/src/reader"
+	"mal/src/readline"
+	. "mal/src/types"
 )
 
 // read

diff --git a/impls/go/src/step7_quote/step7_quote.go b/impls/go/src/step7_quote/step7_quote.go
@@ -8,12 +8,12 @@ import (
 )
 
 import (
-	"core"
-	. "env"
-	"printer"
-	"reader"
-	"readline"
-	. "types"
+	"mal/src/core"
+	. "mal/src/env"
+	"mal/src/printer"
+	"mal/src/reader"
+	"mal/src/readline"
+	. "mal/src/types"
 )
 
 // read

diff --git a/impls/go/src/step8_macros/step8_macros.go b/impls/go/src/step8_macros/step8_macros.go
@@ -8,12 +8,12 @@ import (
 )
 
 import (
-	"core"
-	. "env"
-	"printer"
-	"reader"
-	"readline"
-	. "types"
+	"mal/src/core"
+	. "mal/src/env"
+	"mal/src/printer"
+	"mal/src/reader"
+	"mal/src/readline"
+	. "mal/src/types"
 )
 
 // read

diff --git a/impls/go/src/step9_try/step9_try.go b/impls/go/src/step9_try/step9_try.go
@@ -8,12 +8,12 @@ import (
 )
 
 import (
-	"core"
-	. "env"
-	"printer"
-	"reader"
-	"readline"
-	. "types"
+	"mal/src/core"
+	. "mal/src/env"
+	"mal/src/printer"
+	"mal/src/reader"
+	"mal/src/readline"
+	. "mal/src/types"
 )
 
 // read

diff --git a/impls/go/src/stepA_mal/stepA_mal.go b/impls/go/src/stepA_mal/stepA_mal.go
@@ -8,12 +8,12 @@ import (
 )
 
 import (
-	"core"
-	. "env"
-	"printer"
-	"reader"
-	"readline"
-	. "types"
+	"mal/src/core"
+	. "mal/src/env"
+	"mal/src/printer"
+	"mal/src/reader"
+	"mal/src/readline"
+	. "mal/src/types"
 )
 
 // read
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ import ( @@
     )
     import (
-    	"types"
+    	"mal/src/types"
     )
     func Pr_list(lst []types.MalType, pr bool,
@@ Expand Down @@