More cleanup.

Author: boynton

Makefile

@@ -1,7 +1,7 @@
 NAME=ell
 PKG=github.com/boynton/$(NAME)
 CMD=$(PKG)/cmd/$(NAME)
-VERSION="v1.0.0"
+VERSION="v2.0.0"
 all:
 	go build -ldflags "-X $(PKG).Version=`git describe --tag`" -o bin/$(NAME) $(CMD)
 

data/boolean.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 type Boolean struct {

data/notation.go renamed to data/elldn.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 import(

data/error.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 import(

data/instance.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 import(

data/list.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 import(

data/number.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 import(

data/string.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 import(

data/struct.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 import(

data/symbol.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 import(

data/type.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 var NullType = primitiveType("<null>")

data/value.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 type Value interface {

data/vector.go

@@ -1,3 +1,18 @@
+/*
+Copyright 2021 Lee Boynton
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
 package data
 
 import(

list.go

@@ -17,7 +17,7 @@ limitations under the License.
 package ell
 
 import (
-	. "github.com/boynton/ell/data" // -> "github.com/boynton/data"
+	. "github.com/boynton/ell/data"
 )
 
 // Car - return the first object in a list
@@ -94,41 +94,6 @@ func ListEqual(l1 Value, l2 Value) bool {
 	return false
 }
 
-/*
-   func listToString(lst *Object) string {
-	var buf bytes.Buffer
-	if lst != EmptyList && lst.cdr != EmptyList && Cddr(lst) == EmptyList {
-		if lst.car == QuoteSymbol {
-			buf.WriteString("'")
-			buf.WriteString(Cadr(lst).String())
-			return buf.String()
-		} else if lst.car == QuasiquoteSymbol {
-			buf.WriteString("`")
-			buf.WriteString(Cadr(lst).String())
-			return buf.String()
-		} else if lst.car == UnquoteSymbol {
-			buf.WriteString("~")
-			buf.WriteString(Cadr(lst).String())
-			return buf.String()
-		} else if lst.car == UnquoteSymbolSplicing {
-			buf.WriteString("~")
-			buf.WriteString(Cadr(lst).String())
-			return buf.String()
-		}
-	}
-	buf.WriteString("(")
-	delim := ""
-	for lst != EmptyList {
-		buf.WriteString(delim)
-		delim = " "
-		buf.WriteString(lst.car.String())
-		lst = lst.cdr
-	}
-	buf.WriteString(")")
-	return buf.String()
-}
-*/
-
 func ListLength(o Value) int {
 	if lst, ok := o.(*List); ok {
 		return lst.Length()

net.go

@@ -236,13 +236,6 @@ func NewConnection(con net.Conn, endpoint string) Value {
 		Out: outchan,
 		Con: con,
 	}
-	/*	connection := new(Object)
-	connection.Type = TcpConnectionType
-	s, _ := Struct([]Value{Intern("input:"), inchan, Intern("output:"), outchan, Intern("name:"), String(name)})
-	connection.car = s
-	connection.Value = con
-	return connection
-	*/
 }
 
 func closeConnection(obj Value) {

notation.go

@@ -27,7 +27,7 @@ import (
 	"strconv"
 	"strings"
 
-	. "github.com/boynton/ell/data" // -> "github.com/boynton/data"
+	. "github.com/boynton/ell/data"
 )
 
 // IsDirectoryReadable - return true of the directory is readable

number.go

@@ -21,7 +21,7 @@ import (
 	"math/rand"
 	"strconv"
 
-	. "github.com/boynton/ell/data" // -> "github.com/boynton/data"
+	. "github.com/boynton/ell/data"
 )
 
 // Zero is the Ell 0 value
@@ -158,3 +158,28 @@ func RandomList(size int, min float64, max float64) *List {
 	}
 	return result
 }
+
+// IntValue - return native int value of the object
+func IntValue(obj Value) int {
+	if p, ok := obj.(*Number); ok {
+		return int(p.Value)
+	}
+	return 0
+}
+
+// Int64Value - return native int64 value of the object
+func Int64Value(obj Value) int64 {
+	if p, ok := obj.(*Number); ok {
+		return int64(p.Value)
+	}
+	return 0
+}
+
+// Float64Value - return native float64 value of the object
+func Float64Value(obj Value) float64 {
+	if p, ok := obj.(*Number); ok {
+		return p.Value
+	}
+	return 0
+}
+