From 350d32c369c9350f2398acf3e785345765df7451 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Tue, 5 Jul 2022 14:47:32 +0200 Subject: [PATCH] in serialization rename op to term --- app/models/logic.rb | 2 +- app/models/logic/binary_operator.rb | 2 +- app/models/logic/champ_value.rb | 2 +- app/models/logic/constant.rb | 2 +- app/models/logic/empty.rb | 2 +- app/models/logic/n_ary_operator.rb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/models/logic.rb b/app/models/logic.rb index f76a7992c..992f0f800 100644 --- a/app/models/logic.rb +++ b/app/models/logic.rb @@ -1,6 +1,6 @@ module Logic def self.from_h(h) - class_from_name(h['op']).from_h(h) + class_from_name(h['term']).from_h(h) end def self.from_json(s) diff --git a/app/models/logic/binary_operator.rb b/app/models/logic/binary_operator.rb index e76a52d39..1af4c8129 100644 --- a/app/models/logic/binary_operator.rb +++ b/app/models/logic/binary_operator.rb @@ -8,7 +8,7 @@ class Logic::BinaryOperator < Logic::Term def to_h { - "op" => self.class.name, + "term" => self.class.name, "left" => @left.to_h, "right" => @right.to_h, "id" => @id diff --git a/app/models/logic/champ_value.rb b/app/models/logic/champ_value.rb index d93dab90b..ad7197960 100644 --- a/app/models/logic/champ_value.rb +++ b/app/models/logic/champ_value.rb @@ -60,7 +60,7 @@ class Logic::ChampValue < Logic::Term def to_h { - "op" => self.class.name, + "term" => self.class.name, "stable_id" => @stable_id, "id" => @id } diff --git a/app/models/logic/constant.rb b/app/models/logic/constant.rb index 24544b934..ae54e58fe 100644 --- a/app/models/logic/constant.rb +++ b/app/models/logic/constant.rb @@ -34,7 +34,7 @@ class Logic::Constant < Logic::Term def to_h { - "op" => self.class.name, + "term" => self.class.name, "value" => @value, "id" => @id } diff --git a/app/models/logic/empty.rb b/app/models/logic/empty.rb index 93bd78fec..ea4961be3 100644 --- a/app/models/logic/empty.rb +++ b/app/models/logic/empty.rb @@ -11,7 +11,7 @@ class Logic::Empty < Logic::Term def to_h { - "op" => self.class.name, + "term" => self.class.name, "id" => @id } end diff --git a/app/models/logic/n_ary_operator.rb b/app/models/logic/n_ary_operator.rb index 07d76a0a5..0e7eb94c8 100644 --- a/app/models/logic/n_ary_operator.rb +++ b/app/models/logic/n_ary_operator.rb @@ -8,7 +8,7 @@ class Logic::NAryOperator < Logic::Term def to_h { - "op" => self.class.name, + "term" => self.class.name, "operands" => @operands.map(&:to_h), "id" => @id }