From 82ceda30ad6fb32382bb6d0565c75fe6a1a01b9f Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Tue, 5 May 2015 17:54:46 -0700 Subject: 1267 - 'routine-state' can use the provided routine id --- cpp/.traces/read-key-in-mu | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'cpp/.traces/read-key-in-mu') diff --git a/cpp/.traces/read-key-in-mu b/cpp/.traces/read-key-in-mu index e07f5a5f..160d5a94 100644 --- a/cpp/.traces/read-key-in-mu +++ b/cpp/.traces/read-key-in-mu @@ -41,17 +41,17 @@ after-brace/0: memory-should-contain ... new/0: routine allocated memory from 1000 to 101000 schedule/0: read-key-in-mu run/0: instruction read-key-in-mu/0 -run/0: {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} <- assume-keyboard/42 {name: "abc", value: 0, type: 0, properties: ["abc": "literal-string"]} +run/0: {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} <- assume-keyboard/43 {name: "abc", value: 0, type: 0, properties: ["abc": "literal-string"]} mem/0: storing 1000 in location 901 run/0: instruction read-key-in-mu/1 run/0: {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} <- assume-keyboard/125 {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} mem/0: location 901 is 1000 run/0: instruction init-fake-keyboard/0 -run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/42 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]} +run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/43 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]} mem/0: array size is 30 mem/0: new alloc: 1004 run/0: instruction init-fake-keyboard/1 -run/0: {name: "result", value: 1, type: 2-12, properties: ["result": "address":"keyboard"]} <- new/42 {name: "keyboard", value: 12, type: 0, properties: ["keyboard": "type"]} +run/0: {name: "result", value: 1, type: 2-12, properties: ["result": "address":"keyboard"]} <- new/43 {name: "keyboard", value: 12, type: 0, properties: ["keyboard": "type"]} mem/0: new alloc: 1035 mem/0: storing 1035 in location 1006 run/0: instruction init-fake-keyboard/2 @@ -86,7 +86,7 @@ mem/0: location 1006 is 1035 run/0: result 0 is 1035 mem/0: storing 1035 in location 901 run/0: instruction read-key-in-mu/2 -run/0: run/43 {name: " +run/0: run/44 {name: " 1:character, 2:boolean, keyboard:address <- read-key keyboard:address 3:character, 4:boolean, keyboard:address <- read-key keyboard:address 5:character, 6:boolean, keyboard:address <- read-key keyboard:address @@ -126,7 +126,7 @@ run/0: instruction run1001/0 run/0: {name: "1", value: 1, type: 4, properties: ["1": "character"]}, {name: "2", value: 2, type: 3, properties: ["2": "boolean"]}, {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} <- read-key/126 {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} mem/0: location 901 is 1035 run/0: instruction read-key/0 -run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/42 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]} +run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/43 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]} mem/0: array size is 30 mem/0: new alloc: 1037 run/0: instruction read-key/1 @@ -210,7 +210,7 @@ run/0: instruction run1001/1 run/0: {name: "3", value: 3, type: 4, properties: ["3": "character"]}, {name: "4", value: 4, type: 3, properties: ["4": "boolean"]}, {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} <- read-key/126 {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} mem/0: location 901 is 1035 run/0: instruction read-key/0 -run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/42 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]} +run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/43 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]} mem/0: array size is 30 mem/0: new alloc: 1068 run/0: instruction read-key/1 @@ -294,7 +294,7 @@ run/0: instruction run1001/2 run/0: {name: "5", value: 5, type: 4, properties: ["5": "character"]}, {name: "6", value: 6, type: 3, properties: ["6": "boolean"]}, {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} <- read-key/126 {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} mem/0: location 901 is 1035 run/0: instruction read-key/0 -run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/42 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]} +run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/43 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]} mem/0: array size is 30 mem/0: new alloc: 1099 run/0: instruction read-key/1 @@ -378,7 +378,7 @@ run/0: instruction run1001/3 run/0: {name: "7", value: 7, type: 4, properties: ["7": "character"]}, {name: "8", value: 8, type: 3, properties: ["8": "boolean"]}, {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} <- read-key/126 {name: "keyboard", value: 901, type: 2, properties: ["keyboard": "address"]} mem/0: location 901 is 1035 run/0: instruction read-key/0 -run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/42 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]} +run/0: {name: "default-space", value: 0, type: 2-5-1, properties: ["default-space": "address":"array":"location"]} <- new/43 {name: "location", value: 1, type: 0, properties: ["location": "type"]}, {name: "30", value: 30, type: 0, properties: ["30": "literal"]} mem/0: array size is 30 mem/0: new alloc: 1130 run/0: instruction read-key/1 @@ -436,7 +436,7 @@ mem/0: storing 0 in location 8 run/0: result 2 is 1035 mem/0: storing 1035 in location 901 run/0: instruction read-key-in-mu/3 -run/0: memory-should-contain/44 {name: " +run/0: memory-should-contain/45 {name: " 1 <- 97 # 'a' 2 <- 1 # first read-key call found a character 3 <- 98 # 'b' -- cgit 1.4.1-2-gfad0