Commit e5064231d5a9877b67037315cc4453e860d09aa4
1 parent
7421144a
rename session_id to id in type Session
Showing
2 changed files
with
13 additions
and
5 deletions
Show diff stats
generic/session.anubis
| @@ -43,7 +43,7 @@ public define Var(List(Session_Field)) | @@ -43,7 +43,7 @@ public define Var(List(Session_Field)) | ||
| 43 | word8(v) then word8(v), | 43 | word8(v) then word8(v), |
| 44 | word4(v) then word4(v), | 44 | word4(v) then word4(v), |
| 45 | fields_set(v) then fields_set(to_Session_Field(v)), | 45 | fields_set(v) then fields_set(to_Session_Field(v)), |
| 46 | - session(v) then session(session(v.session_id, to_Session_Field(v.fields))), | 46 | + session(v) then session(session(v.id, to_Session_Field(v.fields))), |
| 47 | }, | 47 | }, |
| 48 | session_field(field.field_name, field.field_type, var(datum)) | 48 | session_field(field.field_name, field.field_type, var(datum)) |
| 49 | , | 49 | , |
| @@ -73,7 +73,7 @@ public define List(Session_Field_No_Var) | @@ -73,7 +73,7 @@ public define List(Session_Field_No_Var) | ||
| 73 | word8(v) then word8(v), | 73 | word8(v) then word8(v), |
| 74 | word4(v) then word4(v), | 74 | word4(v) then word4(v), |
| 75 | fields_set(v) then fields_set(to_Session_Field_No_Var(*v)) | 75 | fields_set(v) then fields_set(to_Session_Field_No_Var(*v)) |
| 76 | - session(v) then session(session(v.session_id, to_Session_Field_No_Var(*v.fields))) | 76 | + session(v) then session(session(v.id, to_Session_Field_No_Var(*v.fields))) |
| 77 | }, | 77 | }, |
| 78 | session_field(field.field_name, field.field_type, datum) | 78 | session_field(field.field_name, field.field_type, datum) |
| 79 | , | 79 | , |
| @@ -1222,7 +1222,7 @@ public define String | @@ -1222,7 +1222,7 @@ public define String | ||
| 1222 | word8(_word8) then name+", Type = Word8, Value = ["+to_decimal(_word8)+"]", | 1222 | word8(_word8) then name+", Type = Word8, Value = ["+to_decimal(_word8)+"]", |
| 1223 | word4(_word4) then name+", Type = Word4, Value = ["+to_decimal(_word4)+"]", | 1223 | word4(_word4) then name+", Type = Word4, Value = ["+to_decimal(_word4)+"]", |
| 1224 | fields_set(_fields) then name+", Type = Fields_set, \n"+dump_Session_Field_list(*_fields, indent+" "), | 1224 | fields_set(_fields) then name+", Type = Fields_set, \n"+dump_Session_Field_list(*_fields, indent+" "), |
| 1225 | - session(_session) then name+", Type = Session, session id = ["+_session.session_id+"]\n"+dump_Session_Field_list(*_session.fields, indent+" "), | 1225 | + session(_session) then name+", Type = Session, session id = ["+_session.id+"]\n"+dump_Session_Field_list(*_session.fields, indent+" "), |
| 1226 | } | 1226 | } |
| 1227 | . | 1227 | . |
| 1228 | 1228 | ||
| @@ -1235,3 +1235,11 @@ public define String | @@ -1235,3 +1235,11 @@ public define String | ||
| 1235 | join("\n", map((Session_Field _field) |-> dump_Session_Field(_field, indent), _fields)) | 1235 | join("\n", map((Session_Field _field) |-> dump_Session_Field(_field, indent), _fields)) |
| 1236 | . | 1236 | . |
| 1237 | 1237 | ||
| 1238 | +public define String | ||
| 1239 | + dump_Session | ||
| 1240 | + ( | ||
| 1241 | + Session _session, | ||
| 1242 | + String indent | ||
| 1243 | + )= | ||
| 1244 | + dump_Session_Field_list(*_session.fields, indent) | ||
| 1245 | +. |
generic/types/session.anubis
| @@ -88,14 +88,14 @@ public type Session_Field_No_Var: | @@ -88,14 +88,14 @@ public type Session_Field_No_Var: | ||
| 88 | 88 | ||
| 89 | public type Session: | 89 | public type Session: |
| 90 | session( | 90 | session( |
| 91 | - String session_id, | 91 | + String id, |
| 92 | Var(List(Session_Field)) fields | 92 | Var(List(Session_Field)) fields |
| 93 | ) | 93 | ) |
| 94 | . | 94 | . |
| 95 | 95 | ||
| 96 | public type Session_No_Var: | 96 | public type Session_No_Var: |
| 97 | session( | 97 | session( |
| 98 | - String session_id, | 98 | + String id, |
| 99 | List(Session_Field_No_Var) fields | 99 | List(Session_Field_No_Var) fields |
| 100 | ) | 100 | ) |
| 101 | . | 101 | . |