style fixes

README.md

@@ -29,7 +29,6 @@
 ```
 TAG :: fragment
 NAME :: fragment
-PREFAB :: fragment
 
 UNIQUE :: fragment
 EXPLICIT :: fragment
@@ -37,6 +36,9 @@ EXPLICIT :: fragment
 DEFAULT :: fragment
 DUPLICATE :: fragment
 
+PREFAB :: fragment
+DISABLED :: fragment
+
 INCLUDES :: fragment
 EXCLUDES :: fragment
 
@@ -53,8 +55,6 @@ EXECUTE :: fragment
 PROLOGUE :: fragment
 EPILOGUE :: fragment
 
-DISABLED :: fragment
-
 DESTROY_POLICY :: fragment
 DESTROY_POLICY_DESTROY_ENTITY :: id
 DESTROY_POLICY_REMOVE_FRAGMENT :: id
@@ -144,7 +144,6 @@ builder:clear :: builder
 
 builder:tag :: builder
 builder:name :: string -> builder
-builder:prefab :: builder
 
 builder:unique :: builder
 builder:explicit :: builder
@@ -152,6 +151,9 @@ builder:explicit :: builder
 builder:default :: component -> builder
 builder:duplicate :: {component -> component} -> builder
 
+builder:prefab :: builder
+builder:disabled :: builder
+
 builder:include :: fragment... -> builder
 builder:exclude :: fragment... -> builder
 
@@ -168,8 +170,6 @@ builder:execute :: {chunk, entity[], integer} -> builder
 builder:prologue :: {} -> builder
 builder:epilogue :: {} -> builder
 
-builder:disabled :: builder
-
 builder:destroy_policy :: id -> builder
 ```
 

evolved.lua

@@ -659,7 +659,6 @@ end
 
 local __TAG = __acquire_id()
 local __NAME = __acquire_id()
-local __PREFAB = __acquire_id()
 
 local __UNIQUE = __acquire_id()
 local __EXPLICIT = __acquire_id()
@@ -667,6 +666,9 @@ local __EXPLICIT = __acquire_id()
 local __DEFAULT = __acquire_id()
 local __DUPLICATE = __acquire_id()
 
+local __PREFAB = __acquire_id()
+local __DISABLED = __acquire_id()
+
 local __INCLUDES = __acquire_id()
 local __EXCLUDES = __acquire_id()
 
@@ -683,8 +685,6 @@ local __EXECUTE = __acquire_id()
 local __PROLOGUE = __acquire_id()
 local __EPILOGUE = __acquire_id()
 
-local __DISABLED = __acquire_id()
-
 local __DESTROY_POLICY = __acquire_id()
 local __DESTROY_POLICY_DESTROY_ENTITY = __acquire_id()
 local __DESTROY_POLICY_REMOVE_FRAGMENT = __acquire_id()
@@ -4951,11 +4951,6 @@ function __builder_mt:name(name)
     return self:set(__NAME, name)
 end
 
----@return evolved.builder builder
-function __builder_mt:prefab()
-    return self:set(__PREFAB)
-end
-
 ---@return evolved.builder builder
 function __builder_mt:unique()
     return self:set(__UNIQUE)
@@ -4978,6 +4973,16 @@ function __builder_mt:duplicate(duplicate)
     return self:set(__DUPLICATE, duplicate)
 end
 
+---@return evolved.builder builder
+function __builder_mt:prefab()
+    return self:set(__PREFAB)
+end
+
+---@return evolved.builder builder
+function __builder_mt:disabled()
+    return self:set(__DISABLED)
+end
+
 ---@param ... evolved.fragment fragments
 ---@return evolved.builder builder
 function __builder_mt:include(...)
@@ -5082,11 +5087,6 @@ function __builder_mt:epilogue(epilogue)
     return self:set(__EPILOGUE, epilogue)
 end
 
----@return evolved.builder builder
-function __builder_mt:disabled()
-    return self:set(__DISABLED)
-end
-
 ---@param destroy_policy evolved.id
 ---@return evolved.builder builder
 function __builder_mt:destroy_policy(destroy_policy)
@@ -5268,7 +5268,6 @@ __evolved_set(__DUPLICATE, __ON_REMOVE, __update_fragment_duplicates)
 
 __evolved_set(__TAG, __NAME, 'TAG')
 __evolved_set(__NAME, __NAME, 'NAME')
-__evolved_set(__PREFAB, __NAME, 'PREFAB')
 
 __evolved_set(__UNIQUE, __NAME, 'UNIQUE')
 __evolved_set(__EXPLICIT, __NAME, 'EXPLICIT')
@@ -5276,6 +5275,9 @@ __evolved_set(__EXPLICIT, __NAME, 'EXPLICIT')
 __evolved_set(__DEFAULT, __NAME, 'DEFAULT')
 __evolved_set(__DUPLICATE, __NAME, 'DUPLICATE')
 
+__evolved_set(__PREFAB, __NAME, 'PREFAB')
+__evolved_set(__DISABLED, __NAME, 'DISABLED')
+
 __evolved_set(__INCLUDES, __NAME, 'INCLUDES')
 __evolved_set(__EXCLUDES, __NAME, 'EXCLUDES')
 
@@ -5292,8 +5294,6 @@ __evolved_set(__EXECUTE, __NAME, 'EXECUTE')
 __evolved_set(__PROLOGUE, __NAME, 'PROLOGUE')
 __evolved_set(__EPILOGUE, __NAME, 'EPILOGUE')
 
-__evolved_set(__DISABLED, __NAME, 'DISABLED')
-
 __evolved_set(__DESTROY_POLICY, __NAME, 'DESTROY_POLICY')
 __evolved_set(__DESTROY_POLICY_DESTROY_ENTITY, __NAME, 'DESTROY_POLICY_DESTROY_ENTITY')
 __evolved_set(__DESTROY_POLICY_REMOVE_FRAGMENT, __NAME, 'DESTROY_POLICY_REMOVE_FRAGMENT')
@@ -5306,13 +5306,17 @@ __evolved_set(__DESTROY_POLICY_REMOVE_FRAGMENT, __NAME, 'DESTROY_POLICY_REMOVE_F
 
 __evolved_set(__TAG, __TAG)
 
+__evolved_set(__UNIQUE, __TAG)
+
+__evolved_set(__EXPLICIT, __TAG)
+
 __evolved_set(__PREFAB, __TAG)
 __evolved_set(__PREFAB, __UNIQUE)
 __evolved_set(__PREFAB, __EXPLICIT)
 
-__evolved_set(__UNIQUE, __TAG)
-
-__evolved_set(__EXPLICIT, __TAG)
+__evolved_set(__DISABLED, __TAG)
+__evolved_set(__DISABLED, __UNIQUE)
+__evolved_set(__DISABLED, __EXPLICIT)
 
 __evolved_set(__INCLUDES, __DEFAULT, {})
 __evolved_set(__INCLUDES, __DUPLICATE, __list_copy)
@@ -5325,10 +5329,6 @@ __evolved_set(__ON_ASSIGN, __UNIQUE)
 __evolved_set(__ON_INSERT, __UNIQUE)
 __evolved_set(__ON_REMOVE, __UNIQUE)
 
-__evolved_set(__DISABLED, __TAG)
-__evolved_set(__DISABLED, __UNIQUE)
-__evolved_set(__DISABLED, __EXPLICIT)
-
 ---
 ---
 ---
@@ -5449,7 +5449,6 @@ end)
 
 evolved.TAG = __TAG
 evolved.NAME = __NAME
-evolved.PREFAB = __PREFAB
 
 evolved.UNIQUE = __UNIQUE
 evolved.EXPLICIT = __EXPLICIT
@@ -5457,6 +5456,9 @@ evolved.EXPLICIT = __EXPLICIT
 evolved.DEFAULT = __DEFAULT
 evolved.DUPLICATE = __DUPLICATE
 
+evolved.PREFAB = __PREFAB
+evolved.DISABLED = __DISABLED
+
 evolved.INCLUDES = __INCLUDES
 evolved.EXCLUDES = __EXCLUDES
 
@@ -5473,8 +5475,6 @@ evolved.EXECUTE = __EXECUTE
 evolved.PROLOGUE = __PROLOGUE
 evolved.EPILOGUE = __EPILOGUE
 
-evolved.DISABLED = __DISABLED
-
 evolved.DESTROY_POLICY = __DESTROY_POLICY
 evolved.DESTROY_POLICY_DESTROY_ENTITY = __DESTROY_POLICY_DESTROY_ENTITY
 evolved.DESTROY_POLICY_REMOVE_FRAGMENT = __DESTROY_POLICY_REMOVE_FRAGMENT