From a02dc4ccc321bdee2a670eecdf5c3bac01fc290b Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Sat, 18 Oct 2014 13:23:01 +0200
Subject: Using proper naming scheme. Fixes #63

---
 ethutil/script.go         | 49 -----------------------------------------------
 ethutil/script_unix.go    | 47 +++++++++++++++++++++++++++++++++++++++++++++
 ethutil/script_windows.go |  2 --
 3 files changed, 47 insertions(+), 51 deletions(-)
 delete mode 100644 ethutil/script.go
 create mode 100644 ethutil/script_unix.go

(limited to 'ethutil')

diff --git a/ethutil/script.go b/ethutil/script.go
deleted file mode 100644
index 8301466cc..000000000
--- a/ethutil/script.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// +build !windows !cgo
-
-package ethutil
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/obscuren/mutan"
-	"github.com/obscuren/mutan/backends"
-	"github.com/obscuren/serpent-go"
-)
-
-// General compile function
-func Compile(script string, silent bool) (ret []byte, err error) {
-	if len(script) > 2 {
-		line := strings.Split(script, "\n")[0]
-
-		if len(line) > 1 && line[0:2] == "#!" {
-			switch line {
-			case "#!serpent":
-				byteCode, err := serpent.Compile(script)
-				if err != nil {
-					return nil, err
-				}
-
-				return byteCode, nil
-			}
-		} else {
-
-			compiler := mutan.NewCompiler(backend.NewEthereumBackend())
-			compiler.Silent = silent
-			byteCode, errors := compiler.Compile(strings.NewReader(script))
-			if len(errors) > 0 {
-				var errs string
-				for _, er := range errors {
-					if er != nil {
-						errs += er.Error()
-					}
-				}
-				return nil, fmt.Errorf("%v", errs)
-			}
-
-			return byteCode, nil
-		}
-	}
-
-	return nil, nil
-}
diff --git a/ethutil/script_unix.go b/ethutil/script_unix.go
new file mode 100644
index 000000000..bd087e7e0
--- /dev/null
+++ b/ethutil/script_unix.go
@@ -0,0 +1,47 @@
+package ethutil
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/obscuren/mutan"
+	"github.com/obscuren/mutan/backends"
+	"github.com/obscuren/serpent-go"
+)
+
+// General compile function
+func Compile(script string, silent bool) (ret []byte, err error) {
+	if len(script) > 2 {
+		line := strings.Split(script, "\n")[0]
+
+		if len(line) > 1 && line[0:2] == "#!" {
+			switch line {
+			case "#!serpent":
+				byteCode, err := serpent.Compile(script)
+				if err != nil {
+					return nil, err
+				}
+
+				return byteCode, nil
+			}
+		} else {
+
+			compiler := mutan.NewCompiler(backend.NewEthereumBackend())
+			compiler.Silent = silent
+			byteCode, errors := compiler.Compile(strings.NewReader(script))
+			if len(errors) > 0 {
+				var errs string
+				for _, er := range errors {
+					if er != nil {
+						errs += er.Error()
+					}
+				}
+				return nil, fmt.Errorf("%v", errs)
+			}
+
+			return byteCode, nil
+		}
+	}
+
+	return nil, nil
+}
diff --git a/ethutil/script_windows.go b/ethutil/script_windows.go
index c1b2d1b21..4f94c6448 100644
--- a/ethutil/script_windows.go
+++ b/ethutil/script_windows.go
@@ -1,5 +1,3 @@
-// +build windows, cgo
-
 package ethutil
 
 import (
-- 
cgit v1.2.3