From e5064231d5a9877b67037315cc4453e860d09aa4 Mon Sep 17 00:00:00 2001 From: totoro Date: Wed, 20 May 2020 16:23:43 +0900 Subject: [PATCH] rename session_id to id in type Session --- generic/session.anubis | 14 +++++++++++--- generic/types/session.anubis | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/generic/session.anubis b/generic/session.anubis index 802048e..8eb4157 100644 --- a/generic/session.anubis +++ b/generic/session.anubis @@ -43,7 +43,7 @@ public define Var(List(Session_Field)) word8(v) then word8(v), word4(v) then word4(v), fields_set(v) then fields_set(to_Session_Field(v)), - session(v) then session(session(v.session_id, to_Session_Field(v.fields))), + session(v) then session(session(v.id, to_Session_Field(v.fields))), }, session_field(field.field_name, field.field_type, var(datum)) , @@ -73,7 +73,7 @@ public define List(Session_Field_No_Var) word8(v) then word8(v), word4(v) then word4(v), fields_set(v) then fields_set(to_Session_Field_No_Var(*v)) - session(v) then session(session(v.session_id, to_Session_Field_No_Var(*v.fields))) + session(v) then session(session(v.id, to_Session_Field_No_Var(*v.fields))) }, session_field(field.field_name, field.field_type, datum) , @@ -1222,7 +1222,7 @@ public define String word8(_word8) then name+", Type = Word8, Value = ["+to_decimal(_word8)+"]", word4(_word4) then name+", Type = Word4, Value = ["+to_decimal(_word4)+"]", fields_set(_fields) then name+", Type = Fields_set, \n"+dump_Session_Field_list(*_fields, indent+" "), - session(_session) then name+", Type = Session, session id = ["+_session.session_id+"]\n"+dump_Session_Field_list(*_session.fields, indent+" "), + session(_session) then name+", Type = Session, session id = ["+_session.id+"]\n"+dump_Session_Field_list(*_session.fields, indent+" "), } . @@ -1235,3 +1235,11 @@ public define String join("\n", map((Session_Field _field) |-> dump_Session_Field(_field, indent), _fields)) . +public define String + dump_Session + ( + Session _session, + String indent + )= + dump_Session_Field_list(*_session.fields, indent) +. diff --git a/generic/types/session.anubis b/generic/types/session.anubis index 73944e8..5be1ec6 100644 --- a/generic/types/session.anubis +++ b/generic/types/session.anubis @@ -88,14 +88,14 @@ public type Session_Field_No_Var: public type Session: session( - String session_id, + String id, Var(List(Session_Field)) fields ) . public type Session_No_Var: session( - String session_id, + String id, List(Session_Field_No_Var) fields ) . -- libgit2 0.21.4