Merge pull request #7 from 1138-4EB/decode-array

Added 'jsonGetIntegerArray'.

Author: Paebbels

Data/Boards0.json

@@ -1,2 +1 @@
- ["test",[true,false,18,null,"hello"],3324.34,832432,"world"]
- 
+ ["test",[true,false,18,null,"hello"],[9,8],3324.34,832432,"world"]

Examples/Boards_VUnit.vhdl

@@ -16,25 +16,27 @@ end entity;
 architecture tb of tb_boards is
   constant JSONContent     : T_JSON := jsonLoad(tb_cfg);
   constant JSONFileContent : T_JSON := jsonLoad(tb_cfg_file);
+  constant tb_imga : integer_vector := jsonGetIntegerArray(JSONContent, "2");
 begin
   main: process
   begin
     test_runner_setup(runner, runner_cfg);
     while test_suite loop
       if run("test") then
+        info("tb_path & tb_cfg_file: " & tb_path & tb_cfg_file);
+        info("JSONFileContent: " & lf & JSONFileContent.Content);
+        info("ML505/FPGA: " & jsonGetString(JSONFileContent, "ML505/FPGA"));
+        info("ML505/Eth/0/PHY-Int: " & jsonGetString(JSONFileContent, "ML505/Eth/0/PHY-Int"));
+        info("KC705/FPGA: " & jsonGetString(JSONFileContent, "KC705/FPGA"));
+        info("KC705/IIC/0/Devices/0/Name: " & jsonGetString(JSONFileContent, "KC705/IIC/0/Devices/0/Name"));
+
         info("tb_cfg: " & tb_cfg);
         info("JSONContent: " & lf & JSONContent.Content);
-        info("ML505/FPGA: " & jsonGetString(JSONContent, "ML505/FPGA"));
-        info("ML505/Eth/0/PHY-Int: " & jsonGetString(JSONContent, "ML505/Eth/0/PHY-Int"));
-        info("KC705/FPGA: " & jsonGetString(JSONContent, "KC705/FPGA"));
-        info("KC705/IIC/0/Devices/0/Name: " & jsonGetString(JSONContent, "KC705/IIC/0/Devices/0/Name"));
 
-        info("tb_path & tb_cfg_file: " & tb_path & tb_cfg_file);
-        info("JSONFileContent: " & lf & JSONFileContent.Content);
-        info("ML505/FPGADevice: " & jsonGetString(JSONFileContent, "ML505/FPGADevice"));
-        info("ML505/Ethernet/0/PHY_Device: " & jsonGetString(JSONFileContent, "ML505/Ethernet/0/PHY_Device"));
-        info("KC705/FPGADevice: " & jsonGetString(JSONFileContent, "KC705/FPGADevice"));
-        info("KC705/IIC/0/Devices/0/Type: " & jsonGetString(JSONFileContent, "KC705/IIC/0/Devices/0/Type"));
+        info("Integer array length: " & jsonGetString(JSONContent, "2/1"));
+        for i in 0 to tb_imga'length-1 loop
+          info("Integer array [" & integer'image(i) & "]: " & integer'image(tb_imga(i)));
+        end loop;
       end if;
     end loop;
     test_runner_cleanup(runner);

VUnit/run.py

@@ -10,11 +10,10 @@
 lib = vu.add_library("lib")
 lib.add_source_files(join(root, "..", "Examples", "Boards_VUnit.vhdl"))
 
-vu.set_generic('tb_cfg_file', '../Data/Boards2.json')
+vu.set_generic('tb_cfg_file', '../Data/Boards1.json')
 
 import json
-file = open('../Data/Boards1.json', 'r')
-generics = json.loads(file.read())
+generics = json.loads(open('../Data/Boards0.json', 'r').read())
 vu.set_generic("tb_cfg", json.dumps(generics, separators=(',', ':')))
 
 vu.main()

vhdl/JSON.ctx.vhdl

@@ -42,11 +42,11 @@ context json_ctx is
   use JSON.json.jsonNoParserError;
   use JSON.json.jsonGetErrorMessage;
   use JSON.json.jsonGetContent;
-  use JSON.json.jsonGetString;
   use JSON.json.jsonGetBoolean;
+  use JSON.json.jsonGetString;
+  use JSON.json.jsonGetIntegerArray;
   use JSON.json.jsonIsBoolean;
   use JSON.json.jsonIsNull;
   use JSON.json.jsonIsString;
   use JSON.json.jsonIsNumber;
---  use JSON.json.jsonGetIntArray;
 end context;

vhdl/JSON.pkg.vhdl

@@ -103,6 +103,9 @@ package JSON is
 
 	function jsonGetBoolean(JSONContext : T_JSON; Path : STRING) return BOOLEAN;
 	function jsonGetString(JSONContext : T_JSON; Path : STRING) return STRING;
+	function jsonGetIntegerArray(JSONContext : T_JSON; Path : string) return integer_vector;
+	function jsonGetIntegerArray(JSONContext : T_JSON; Path : string; Len : positive) return integer_vector;
+--	function jsonGetRealArray(JSONContext : T_JSON; Path : string) return real_vector;
 
 	function jsonIsBoolean(JSONContext : T_JSON; Path : STRING) return BOOLEAN;
 	function jsonIsNull(JSONContext : T_JSON; Path : STRING) return BOOLEAN;
@@ -1485,7 +1488,7 @@ package body JSON is
 				end if;	-- Index = 0
 				for j in 1 to Index loop
 					if (IndexElement.NextIndex = 0) then
-						report "jsonGetElementIndex: Reached last element in chain." severity FAILURE;
+						report "jsonGetElementIndex: Reached last element in chain." severity NOTE; --FAILURE
 						return 0;
 					end if;
 					IndexElement		:= JSONContext.Index(IndexElement.NextIndex);
@@ -1619,6 +1622,26 @@ package body JSON is
 		return (Element.ElementType = ELEM_TRUE);
 	end function;
 
+	-- function to get a integer_vector from the compressed content extracted from a JSON input
+	function jsonGetIntegerArray(JSONContext : T_JSON; Path : string) return integer_vector is
+	  variable len: natural:=0;
+	begin
+	  while jsonIsNumber(JSONContext, Path & "/" & to_string(len)) loop
+	    len := len+1;
+	  end loop;
+	  return jsonGetIntegerArray(JSONContext, Path, len);
+	end;
+
+	-- function to get a integer_vector of a fixed length from the compressed content extracted from a JSON input
+	function jsonGetIntegerArray(JSONContext : T_JSON; Path : string; Len : positive) return integer_vector is
+	  variable return_value : integer_vector(Len-1 downto 0);
+	begin
+	  for i in 0 to Len-1 loop
+	    return_value(i) := to_natural_dec(jsonGetString(JSONContext, Path & "/" & to_string(i)));
+	  end loop;
+	  return return_value;
+	end function;
+
 	function jsonIsBoolean(JSONContext : T_JSON; Path : STRING) return BOOLEAN is
 		constant ElementIndex	: T_UINT16							:= jsonGetElementIndex(JSONContext, Path);
 		constant Element			: T_JSON_INDEX_ELEMENT	:= JSONContext.Index(ElementIndex);