wip: Change everything

Author: hyperupcall

README.md

@@ -2,14 +2,16 @@
 
 The _first_ Bash library parsing JSON in Bash
 
+Status: IN DEVELOPMENT
+
 ## Summary
 
 - Uses only builtins and no subshells
 - Leverages [bash-object](https://github.com/hyperupcall/bash-object)
 
 ## Installation
 
-Use Basalt, a Bash package manager, to add this project as a dependency
+Use [Basalt](https://github.com/hyperupcall/basalt), a Bash package manager, to add this project as a dependency
 
 ```sh
 basalt add hyperupcall/bash-json

examples/file.json

@@ -1,9 +1,2 @@
 {
-	"aa": 32,
-	"bb": "three",
-	"apple": {
-		"keeyy": "valuee",
-		"v": "b"
-	},
-	"other": 20
-}
+	"a":}

pkg/src/public/bash-json.sh

@@ -8,41 +8,53 @@ bash_json.parse() {
 
 	local -a TOKENS=()
 
-	# Construct token sequence
-	local -i col=1 row=1 i=
+	# 1. Construct token sequence
+	# 'scan_*' functions are modified in variuos 'tokenize_' functions
+	local scan_step_fn='bash_json.tokenize_begin_value'
+	local -a scan_stack=()
+	local -i scan_col=1 scan_row=1
+
+	local i=
 	for ((i=0; i<${#content}; ++i)); do
 		local char="${content:$i:1}"
 
-		local prefix="$col:$row:"
-		case $char in
-			'{') TOKENS+=("$prefix"'TOKEN_OPEN_CURLEYBRACE') ;;
-			'}') TOKENS+=("$prefix"'TOKEN_CLOSE_CURLEYBRACE') ;;
-			'[') TOKENS+=("$prefix"'TOKEN_OPEN_SQUAREBRACKET') ;;
-			']') TOKENS+=("$prefix"'TOKEN_CLOSE_SQUAREBRACKET') ;;
-			':') TOKENS+=("$prefix"'TOKEN_COLON') ;;
-			',') TOKENS+=("$prefix"'TOKEN_COMMA') ;;
-			'"')
-				local str=
-				bash_json.tokenize_string || true
-				TOKENS+=($'\x01'"${prefix}${str}")
-				col+=$((${#str}+1))
-				;;
-			[[:digit:]])
-				local str=
-				bash_json.tokenize_number || true
-				TOKENS+=($'\x02'"${prefix}${str}")
-				col+=$((${#str}-1))
-				;;
-			$'\n')
-				row+=1
-				col=0
-				;;
-			' '|$'\t'|$'\r')
-				;;
-			*) core.print_die "Failed: $char"
-				;;
-		esac
-		col+=1
+		if "$scan_step_fn" "$char"; then
+			core.print_die 'Error'
+		fi
+		# local prefix="$row:$col:"
+		# case $char in
+		# 	'{')
+		# 		state_stack+=('scan_begin_object')
+		# 		;;
+		# 	# '{')TOKENS+=("$prefix"'TOKEN_OPEN_CURLEYBRACE') ;;
+		# 	# '}') TOKENS+=("$prefix"'TOKEN_CLOSE_CURLEYBRACE') ;;
+		# 	# '[') TOKENS+=("$prefix"'TOKEN_OPEN_SQUAREBRACKET') ;;
+		# 	# ']') TOKENS+=("$prefix"'TOKEN_CLOSE_SQUAREBRACKET') ;;
+		# 	# ':') TOKENS+=("$prefix"'TOKEN_COLON') ;;
+		# 	# ',') TOKENS+=("$prefix"'TOKEN_COMMA') ;;
+		# 	'"')
+		# 		local str=
+		# 		bash_json.tokenize_string || true
+		# 		TOKENS+=($'\x01'"${prefix}${str}")
+		# 		col+=$((${#str}+1))
+		# 		;;
+		# 	[[:digit:]])
+		# 		local str=
+		# 		bash_json.tokenize_number || true
+		# 		TOKENS+=($'\x02'"${prefix}${str}")
+		# 		col+=$((${#str}-1))
+		# 		;;
+		# 	$'\n')
+		# 		row+=1
+		# 		col=0
+		# 		;;
+		# 	' '|$'\t'|$'\r')
+		# 		;;
+		# 	*) core.print_die "Failed: $char"
+		# 		;;
+		# esac
+
+		scan_col+=1
 	done; unset -v i
 
 	# Print token sequence
@@ -53,28 +65,32 @@ bash_json.parse() {
 		i=$((i+1))
 	done
 
-	# Construct object using token sequence
-	if [ "${TOKENS[0]##*:}" = 'TOKEN_OPEN_CURLEYBRACE' ]; then
-		bash_json.parse_array_or_object "$variable_prefix" 0 '.'
+	# if ((${#TOKENS[@]} == 0)); then
+	# 	core.panic "JSON file empty"
+	# fi
+
+	# # Construct object using token sequence
+	# if [ "${TOKENS[0]##*:}" = 'TOKEN_OPEN_CURLEYBRACE' ]; then
+	# 	bash_json.parse_object "$variable_prefix" 1 '.'
 
-		REPLY1=$variable_prefix
-		REPLY2='object'
-	elif [ "${TOKENS[0]##*:}" = 'TOKEN_OPEN_SQUAREBRACKET' ]; then
-		bash_json.parse_array_or_object "$variable_prefix" 0 '.'
+	# 	REPLY1=$variable_prefix
+	# 	REPLY2='object'
+	# elif [ "${TOKENS[0]##*:}" = 'TOKEN_OPEN_SQUAREBRACKET' ]; then
+	# 	bash_json.parse_array_or_object "$variable_prefix" 0 '.'
 
-		REPLY1=$variable_prefix
-		REPLY2='array'
-	elif [ "${TOKENS[0]::1}" = $'\x01' ]; then
-		bash_json.parse_primitive
+	# 	REPLY1=$variable_prefix
+	# 	REPLY2='array'
+	# elif [ "${TOKENS[0]::1}" = $'\x01' ]; then
+	# 	bash_json.parse_primitive
 
-		REPLY1=$REPLY
-		REPLY2='string'
-	elif [ "${TOKENS[0]::1}" = $'\x02' ]; then
-		bash_json.parse_primitive
+	# 	REPLY1=$REPLY
+	# 	REPLY2='string'
+	# elif [ "${TOKENS[0]::1}" = $'\x02' ]; then
+	# 	bash_json.parse_primitive
 
-		REPLY1=$REPLY
-		REPLY2='number'
-	else
-		core.panic 'Unexpected token'
-	fi
+	# 	REPLY1=$REPLY
+	# 	REPLY2='number'
+	# else
+	# 	core.panic 'Unexpected token'
+	# fi
 }