FreeBSD compatibility + int64/uint64 type support

.gitignore

@@ -1,3 +1,24 @@
-.vagrant/
-vendor/
-/libucl.dll
+# Compiled Object files, Static and Dynamic libs (Shared Objects)
+*.o
+*.a
+*.so
+
+# Folders
+_obj
+_test
+
+# Architecture specific extensions/prefixes
+*.[568vq]
+[568vq].out
+
+*.cgo1.go
+*.cgo2.c
+_cgo_defun.c
+_cgo_gotypes.go
+_cgo_export.*
+
+_testmain.go
+
+*.exe
+*.test
+*.prof

.travis-ucl.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+UCL_VERSION=0.7.3
+set -ex
+mkdir /tmp/libucl
+cd /tmp/libucl
+wget https://github.com/vstakhov/libucl/archive/$UCL_VERSION.tar.gz
+tar xzf $UCL_VERSION.tar.gz
+cd libucl-$UCL_VERSION && ./autogen.sh && ./configure --prefix=/usr --enable-urls --enable-signatures && make && sudo make install
+rm -fr /tmp/libucl

.travis.yml

@@ -1,6 +1,8 @@
+sudo: required
 language: go
 
 go:
-  - 1.2.1
+  - tip
 
-script: make test
+before_install:
+  - ./.travis-ucl.sh

README.md

@@ -1,28 +1,34 @@
 # Libucl Library for Go
+[![Build Status](https://travis-ci.org/bitmark-inc/go-libucl.svg?branch=master)](https://travis-ci.org/bitmark-inc/go-libucl)
+[![GoDoc](https://godoc.org/github.com/bitmark-inc/go-libucl?status.svg)](https://godoc.org/github.com/bitmark-inc/go-libucl)
+
+This version of go-libucl is forked from the[mitchellh version](https://github.com/mitchellh/go-libucl),
+and [draring version](http://godoc.org/github.com/draringi/go-libucl)
+with the goal of having a version with a focus on using the OS's copy of libucl, in a portable manner,
+as well as improve the Documentation quality.
+As such, it uses pkg-config to determine the location of libucl.
 
 go-libucl is a [libucl](https://github.com/vstakhov/libucl) library for
 [Go](http://golang.org). Rather than re-implement libucl in Go, this library
 uses cgo to bind directly to libucl. This allows the libucl project to be
-the central source of knowledge. This project works on Mac OS X, Linux, and
-Windows.
+the central source of knowledge. This project has been tested on Linux and FreeBSD.
 
 **Warning:** This library is still under development and API compatibility
 is not guaranteed. Additionally, it is not feature complete yet, though
 it is certainly usable for real purposes (we do!).
 
-## Installation
+## Notes
+* macro calling convention changed
+* macro callback now gets paramters object in addion to body text
 
-Because we vendor the source of libucl, you can go ahead and get it directly.
-We'll keep up to date with libucl. The package name is `libucl`.
+## Prerequisites
+* libucl (This is a wrapper for this library)
+* pkg-config (cgo uses this for locate where libucl is)
+
+## Installation
 
 ```
-$ go get github.com/mitchellh/go-libucl
+$ go get github.com/bitmark-inc/go-libucl
 ```
 
-Documentation is available on GoDoc: http://godoc.org/github.com/mitchellh/go-libucl
-
-### Compiling Libucl
-
-Libucl should compile easily and cleanly on POSIX systems.
-
-On Windows, msys should be used. msys-regex needs to be compiled.
+Documentation is available on GoDoc: http://godoc.org/github.com/bitmark-inc/go-libucl

decoder.go

@@ -24,6 +24,12 @@ func decode(name string, o *Object, result reflect.Value) error {
 		return decodeIntoInterface(name, o, result)
 	case reflect.Int:
 		return decodeIntoInt(name, o, result)
+	case reflect.Int64:
+		return decodeIntoInt(name, o, result)
+	case reflect.Uint:
+		return decodeIntoUint(name, o, result)
+	case reflect.Uint64:
+		return decodeIntoUint(name, o, result)
 	case reflect.Map:
 		return decodeIntoMap(name, o, result)
 	case reflect.Ptr:
@@ -37,8 +43,6 @@ func decode(name string, o *Object, result reflect.Value) error {
 	default:
 		return fmt.Errorf("%s: unsupported type: %s", name, result.Kind())
 	}
-
-	return nil
 }
 
 func decodeIntoBool(name string, o *Object, result reflect.Value) error {
@@ -73,6 +77,22 @@ func decodeIntoInt(name string, o *Object, result reflect.Value) error {
 	return nil
 }
 
+func decodeIntoUint(name string, o *Object, result reflect.Value) error {
+	switch o.Type() {
+	case ObjectTypeString:
+		i, err := strconv.ParseUint(o.ToString(), 0, result.Type().Bits())
+		if err == nil {
+			result.SetUint(i)
+		} else {
+			return fmt.Errorf("cannot parse '%s' as int: %s", name, err)
+		}
+	default:
+		result.SetUint(o.ToUint())
+	}
+
+	return nil
+}
+
 func decodeIntoInterface(name string, o *Object, result reflect.Value) error {
 	var set reflect.Value
 	redecode := true
@@ -114,12 +134,13 @@ func decodeIntoInterface(name string, o *Object, result reflect.Value) error {
 		for o := outer.Next(); o != nil; o = outer.Next() {
 			m := make(map[string]interface{})
 			inner := o.Iterate(true)
+		inner_loop:
 			for o2 := inner.Next(); o2 != nil; o2 = inner.Next() {
 				var raw interface{}
 				err = decode(name, o2, reflect.Indirect(reflect.ValueOf(&raw)))
 				o2.Close()
 				if err != nil {
-					break
+					break inner_loop
 				}
 
 				m[o2.Key()] = raw
@@ -139,7 +160,7 @@ func decodeIntoInterface(name string, o *Object, result reflect.Value) error {
 		set = reflect.Indirect(reflect.New(reflect.TypeOf("")))
 	default:
 		return fmt.Errorf(
-			"%s: unsupported type to interface: %s", name, o.Type())
+			"%s: unsupported type to interface: %v", name, o.Type())
 	}
 
 	if redecode {
@@ -269,7 +290,7 @@ func decodeIntoString(name string, o *Object, result reflect.Value) error {
 	case ObjectTypeInt:
 		result.SetString(strconv.FormatInt(o.ToInt(), 10))
 	default:
-		return fmt.Errorf("%s: unsupported type to string: %s", name, objType)
+		return fmt.Errorf("%s: unsupported type to string: %v", name, objType)
 	}
 
 	return nil
@@ -290,6 +311,7 @@ func decodeIntoStruct(name string, o *Object, result reflect.Value) error {
 		structs = structs[1:]
 
 		structType := structVal.Type()
+	struct_loop:
 		for i := 0; i < structType.NumField(); i++ {
 			fieldType := structType.Field(i)
 
@@ -305,16 +327,17 @@ func decodeIntoStruct(name string, o *Object, result reflect.Value) error {
 				// if specified in the tag.
 				squash := false
 				tagParts := strings.Split(fieldType.Tag.Get(tagName), ",")
+			tag_loop:
 				for _, tag := range tagParts[1:] {
 					if tag == "squash" {
 						squash = true
-						break
+						break tag_loop
 					}
 				}
 
 				if squash {
 					structs = append(structs, result.FieldByName(fieldType.Name))
-					continue
+					continue struct_loop
 				}
 			}
 
@@ -325,8 +348,9 @@ func decodeIntoStruct(name string, o *Object, result reflect.Value) error {
 
 	usedKeys := make(map[string]struct{})
 	decodedFields := make([]string, 0, len(fields))
-	decodedFieldsVal := make([]reflect.Value, 0)
-	unusedKeysVal := make([]reflect.Value, 0)
+	var decodedFieldsVal []reflect.Value
+	var unusedKeysVal []reflect.Value
+field_loop:
 	for fieldType, field := range fields {
 		if !field.IsValid() {
 			// This should never happen
@@ -336,7 +360,7 @@ func decodeIntoStruct(name string, o *Object, result reflect.Value) error {
 		// If we can't set the field, then it is unexported or something,
 		// and we just continue onwards.
 		if !field.CanSet() {
-			continue
+			continue field_loop
 		}
 
 		fieldName := fieldType.Name
@@ -347,20 +371,20 @@ func decodeIntoStruct(name string, o *Object, result reflect.Value) error {
 			switch tagParts[1] {
 			case "decodedFields":
 				decodedFieldsVal = append(decodedFieldsVal, field)
-				continue
+				continue field_loop
 			case "key":
 				field.SetString(o.Key())
-				continue
+				continue field_loop
 			case "object":
 				// Increase the ref count
 				o.Ref()
 
 				// Sete the object
 				field.Set(reflect.ValueOf(o))
-				continue
+				continue field_loop
 			case "unusedKeys":
 				unusedKeysVal = append(unusedKeysVal, field)
-				continue
+				continue field_loop
 			}
 		}
 
@@ -373,9 +397,10 @@ func decodeIntoStruct(name string, o *Object, result reflect.Value) error {
 			// Do a slower search by iterating over each key and
 			// doing case-insensitive search.
 			iter := o.Iterate(true)
+		element_loop:
 			for elem = iter.Next(); elem != nil; elem = iter.Next() {
 				if strings.EqualFold(elem.Key(), fieldName) {
-					break
+					break element_loop
 				}
 
 				elem.Close()
@@ -384,7 +409,7 @@ func decodeIntoStruct(name string, o *Object, result reflect.Value) error {
 
 			if elem == nil {
 				// No key matching this field.
-				continue
+				continue field_loop
 			}
 		}
 
@@ -402,16 +427,17 @@ func decodeIntoStruct(name string, o *Object, result reflect.Value) error {
 			err = decode(fieldName, elem, field)
 		} else {
 			iter := elem.Iterate(false)
+		iteration_loop:
 			for {
 				obj := iter.Next()
 				if obj == nil {
-					break
+					break iteration_loop
 				}
 
 				err = decode(fieldName, obj, field)
 				obj.Close()
 				if err != nil {
-					break
+					break iteration_loop
 				}
 			}
 			iter.Close()