Merge remote-tracking branch 'refs/remotes/origin/mustacheless' into mustacheless

decode.odin

@@ -1,30 +1,69 @@
 package mustache
 
-import "base:runtime"
 import "core:reflect"
+import "core:strings"
 import "core:log"
+import "core:fmt"
 
-decode :: proc( v: any, key: string ) -> string {
+decode :: proc( v: any, key: string ) -> any {
-
 	if v == nil do return ""
 
-	ti := runtime.type_info_base(type_info_of(v.id))
+	v := reflect.any_base(v)
-	a := any{v.data, ti.id}
+	ti := type_info_of(v.id)
 
-	#partial switch info in ti.variant {
+	switch  {
+	case reflect.is_struct(ti):
+		newkey, err := strings.split_after_n(key, ".", 2)
 
-	case runtime.Type_Info_Struct:
+		if len(newkey) != 2 || err != nil {
 			return decode( reflect.struct_field_value_by_name(v, key), "." )
-
-	case runtime.Type_Info_String:
-		switch s in a {
-		case string:
-			return string(s)
-		case cstring:
-			return string(s)
 		}
 
+		return decode( reflect.struct_field_value_by_name(v, newkey[0][:len(newkey[0])-1]), newkey[1] )
+	case reflect.is_string(ti):
+		if key != "." do return ""
+		return  v
+	case reflect.is_integer(ti):
+		if key != "." do return ""
+		return  v
+	case reflect.is_enum(ti):
+		return decode(any{v.data, ti.id}, key)
+	case reflect.is_slice(ti):
+		if key != "." do return ""
+		return  v
+	case:
+		log.warnf("%v", ti)
 	}
 
 	return ""
 }
+
+decode_string :: proc( v: any, key: string ) -> string {
+	return fmt.tprintf("%v", decode(v, key))
+}
+
+preprocess :: proc( r: ^strings.Reader, v: any, key: string ) -> string {
+	if v == nil do return ""
+
+	save := r.i
+
+	t := reflect.any_base(decode(v, key))
+	ti := type_info_of(t.id)
+
+	ret : string
+	switch  {
+	case reflect.is_slice(ti):
+		for i in 0..<reflect.length(t) {
+			elem :=reflect.index(t, i);
+
+			strings.reader_seek(r, save, .Start)
+			tmp := mustache(r, elem, key)
+			defer delete(tmp)
+
+			ret = strings.concatenate({ret, tmp})
+			log.infof(ret)
+		}
+	}
+
+	return ret
+}

mustache.odin

@@ -1,8 +1,8 @@
 package mustache
 
+import "core:log"
 import "core:strings"
 
-@private
 state :: enum {
 	writing,
 	reading_key,
@@ -10,6 +10,7 @@ state :: enum {
 	close_bracket,
 }
 
+mustache :: proc{mustache_reader, mustache_string}
 /*
 Input:
 - fmt: A string with placeholders in the form `{{key}}`.
@@ -20,7 +21,13 @@ A new string with all placeholders replaced by their corresponding values from
 the dictionary. If a key is missing in the dictionary, the placeholder is 
 replaces with an empty string.
 */
-mustache :: proc(fmt: string, v: any ) -> string {
+mustache_string :: proc(fmt: string, v: any ) -> string {
+	r : strings.Reader
+	strings.reader_init(&r, fmt)
+	return  mustache(&r, v, "")
+}
+
+mustache_reader :: proc(r: ^strings.Reader, v: any, end_block: string ) -> string {
 	/*
 	template works as a state machine, it manipulates `b` (returned string)
 	and `key` (placeholder string), according to  the states. No error
@@ -33,7 +40,14 @@ mustache :: proc(fmt: string, v: any ) -> string {
 
 	s:= state.writing
 
-	for c in fmt do switch c {
+	for {
+		c, _, err := strings.reader_read_rune(r); 
+
+		if err != nil  {
+			break
+		}
+
+		switch c {
 		case '{':
 			switch s {
 			case .open_bracket:
@@ -52,9 +66,25 @@ mustache :: proc(fmt: string, v: any ) -> string {
 				strings.write_string(&b, "{}" )
 				s=.writing
 			case .close_bracket:
-			strings.write_string(&b, decode(v, strings.to_string(key) ))
+				// Work with key
+				skey := strings.to_string(key)
 				strings.builder_reset(&key)
 				s=.writing
+
+				if len(skey) == 0 {
+					break
+				}
+
+				switch skey[0] {
+				case '/':
+					if skey[1:] == end_block {
+						return strings.to_string(b)
+					}
+				case '#':
+					strings.write_string(&b, preprocess(r, v, skey[1:]) )
+				case:
+					strings.write_string(&b, decode_string(v, skey) )
+				}
 			case .writing:
 				strings.write_rune(&b, '}' )
 				s=.writing
@@ -78,6 +108,7 @@ mustache :: proc(fmt: string, v: any ) -> string {
 				strings.write_rune(&key, c )
 			}
 		}
+	}
 
 	switch s {
 	case .open_bracket: