Changeset 32 for ruby/trunk/models/am

Timestamp:

May 6, 2008, 12:18:06 AM (16 years ago)

Author:

Tatsukawa, Akimichi

Message:

fixed Archetype::Constraint_Model and Primitive classes

Location:

ruby/trunk/models/am/archetype/constraint_model

Files:

• archetype_constraint.rb (modified) (4 diffs)
• primitive.rb (modified) (3 diffs)

ruby/trunk/models/am/archetype/constraint_model/archetype_constraint.rb

@@ -19 +19 @@
             @occurrences = args[:occurrences] if args[:occurrences]
             @rm_type_name = args[:rm_type_name] if args[:rm_type_name]
+          end
+
+          def self.create(args = { }, &block)
+            c_object = new(args)
+            if block_given?
+              yield c_object
+            end
+            return c_object
           end
         end
@@ -44 +52 @@
         class C_PRIMITIVE_OBJECT < C_DEFINED_OBJECT
           attr_accessor :item
-          
+
           def initialize(args = { })
             @attributes = args[:item] if args[:item]
@@ -53 +61 @@
         class C_COMPLEX_OBJECT < C_DEFINED_OBJECT
           attr_accessor :attributes, :attributes_valid
-          
+
           def initialize(args = { })
             @attributes = args[:attributes] ? args[:attributes] : []
@@ -73 +81 @@
 
         class C_REFERENCE_OBJECT < C_OBJECT
-          
         end
 
         class ARCHETYPE_INTERNAL_REF < C_REFERENCE_OBJECT
-          
+          attr_accessor :target_path
         end
 
         class ARCHETYPE_SLOT < C_REFERENCE_OBJECT
-          
+          attr_accessor :includes, :excludes
+
+          def self.create(args = { }, &block)
+            archetype_slot = new(args)
+            archetype_slot.includes = args[:includes]
+            archetype_slot.excludes = args[:excludes]
+            if block_given?
+              yield archetype_slot
+            end
+            return archetype_slot
+          end
         end
 
         class CONSTRAINT_REF < C_REFERENCE_OBJECT
-          
+          attr_accessor :reference
+
+          def self.create(args = { }, &block)
+            constraint_ref = new(args)
+            constraint_ref.reference = args[:reference]
+            if block_given?
+              yield constraint_ref
+            end
+            return constraint_ref
+          end
         end
 

ruby/trunk/models/am/archetype/constraint_model/primitive.rb

@@ -7 +7 @@
 
           class C_PRIMITIVE
+
+            def initialize
+              raise "abstract class"
+            end
+
+            def self.create(args = {})
+              instance = new(args)
+
+              if block_given?
+                yield instance
+              end
+              return instance
+            end
+
+
             def assumed_value
               raise NotImplementedError, "assumed_value should be implemented"
             end
+
             def default_value
               raise NotImplementedError, "assumed_value should be implemented"
             end
+
             def has_assumed_value?
               assumed_value != nil
             end
+
             def valid_value?
               raise NotImplementedError, "valid_value? should be implemented"
@@ -50 +68 @@
               else
                 (a_value && @true_valid) || (!a_value && @false_valid) 
-              end              
+              end
             end
 
@@ -58 +76 @@
               if !true_valid && !false_valid
                 raise ArgumentError, "Either true_valid or false_valid must be true"
-              end              
+              end
             end
           end # of C_Boolean
 
           class C_STRING < C_PRIMITIVE
-            
+            attr_accessor :list, :assumed_value, :list_open, :pattern
+
+            def initialize(args = { })
+              @list, @assumed_value, @list_open, @pattern = args[:list], args[:assumed_value], args[:list_open], args[:pattern]
+            end
           end
 
           class C_INTEGER < C_PRIMITIVE
-            
+            attr_accessor :list, :range, :assumed_value
+
+            def initialize(args = { })
+              @list, @range, @assumed_value = args[:list], args[:range], args[:assumed_value]
+            end
+
+            def self.create(args = {})
+              c_primitive = new(args)
+
+              if block_given?
+                yield c_primitive
+              end
+              return c_primitive
+            end
           end
 
           class C_REAL < C_PRIMITIVE
-            
+            attr_accessor :list, :range, :assumed_value
+
+            def initialize(args = { })
+              @list, @range, @assumed_value = args[:list], args[:range], args[:assumed_value]
+            end
           end
 
           class C_TIME < C_PRIMITIVE
-            
+            attr_accessor :assumed_value, :milli_second_validity, :minute_validity, :range, :second_validity, :timezone_validity
+            def initialize(args = { })
+              @assumed_value, @milli_second_validity, @minute_validity, @month_validity, @range, @second_validity, @timezone_validity = args[:assumed_value], args[:milli_second_validity], args[:minute_validity], args[:range], args[:second_validity], args[:timezone_validity]
+            end
           end
 
           class C_DATE < C_PRIMITIVE
-            
+            attr_accessor :assumed_value, :day_validity, :hour_validity, :month_validity, :range, :timezone_validity
+            def initialize(args = { })
+              @assumed_value, @day_validity, @hour_validity,  @month_validity, @range,  @timezone_validity = args[:assumed_value], args[:day_validity], args[:hour_validity], args[:month_validity], args[:range], args[:timezone_validity]
+            end
           end
 
           class C_DATE_TIME < C_PRIMITIVE
-            
+            attr_accessor :assumed_value, :day_validity, :hour_validity, :milli_second_validity, :minute_validity, :month_validity, :range, :second_validity, :timezone_validity
+            def initialize(args = { })
+              @assumed_value, @day_validity, @hour_validity, @milli_second_validity, @minute_validity, @month_validity, @range, @second_validity, @timezone_validity = args[:assumed_value], args[:day_validity], args[:hour_validity], args[:milli_second_validity], args[:minute_validity], args[:month_validity], args[:range], args[:second_validity], args[:timezone_validity]
+            end
           end
 
           class C_DURATION < C_PRIMITIVE
             attr_accessor :years_allowed, :months_allowed, :weeks_allowed, :days_allowed, :hours_allowed, :minutes_allowed, :seconds_allowed, :fractional_seconds_allowed, :range, :assumed_value
+
+            def initialize(args = { })
+              @years_allowed, @months_allowed, @weeks_allowed, @days_allowed, @hours_allowed, @minutes_allowed, @seconds_allowed, @fractional_seconds_allowed, @range, @assumed_value = args[:years_allowed], args[:months_allowed], args[:weeks_allowed], args[:days_allowed], args[:hours_allowed], args[:minutes_allowed], args[:seconds_allowed], args[:fractional_seconds_allowed], args[:range], args[:assumed_value]
+            end
           end