Clean up enums

johnnovak · Mar 19, 2024 · 457cf95 · 457cf95
1 parent 636c4c8
commit 457cf95
Show file tree

Hide file tree

Showing 5 changed files with 227 additions and 227 deletions.
diff --git a/config.nims b/config.nims
@@ -58,8 +58,8 @@ proc createZip(zipName, srcPath: string, extraArgs = "") =
   exec fmt"zip -q -9 -r ""{zipName}"" ""{srcPath}"" {extraArgs}"
 
 type Arch = enum
-  Arch32 = (0, "32")
-  Arch64 = (1, "64")
+  Arch32 = "32"
+  Arch64 = "64"
 
 let arch = if hostCPU == "i386": Arch32 else: Arch64
 

diff --git a/src/common.nim b/src/common.nim
@@ -38,16 +38,16 @@ type
 
 type
   CardinalDir* = enum
-    dirN  = (0, "North")
-    dirE  = (1, "East")
-    dirS  = (2, "South")
-    dirW  = (3, "West")
+    dirN = "North"
+    dirE = "East"
+    dirS = "South"
+    dirW = "West"
 
   Direction* = set[CardinalDir]
 
   Orientation* = enum
-    Horiz = (0, "horizontal")
-    Vert  = (1, "vertical")
+    Horiz = "horizontal"
+    Vert  = "vertical"
 
 const
   North*     = {dirN}
@@ -171,28 +171,28 @@ type
     trail*:            bool
 
   Floor* = enum
-    fEmpty               = ( 0, "none"),
-    fBlank               = ( 1, "blank"),
-    fDoor                = (20, "open door"),
-    fLockedDoor          = (21, "locked door"),
-    fArchway             = (22, "archway"),
-    fSecretDoorBlock     = (23, "secret door (block)"),
-    fSecretDoor          = (24, "secret door"),
-    fOneWayDoor1         = (25, "one-way door"),
-    fOneWayDoor2         = (26, "one-way door"),
-    fPressurePlate       = (30, "pressure plate"),
-    fHiddenPressurePlate = (31, "hidden pressure plate"),
-    fClosedPit           = (40, "closed pit"),
-    fOpenPit             = (41, "open pit"),
-    fHiddenPit           = (42, "hidden pit"),
-    fCeilingPit          = (43, "ceiling pit"),
-    fStairsDown          = (50, "stairs down"),
-    fStairsUp            = (51, "stairs up"),
-    fEntranceDoor        = (52, "entrance door"),
-    fExitDoor            = (53, "exit door"),
-    fSpinner             = (60, "spinner"),
-    fTeleportSource      = (70, "teleport"),
-    fTeleportDestination = (71, "teleport destination"),
+    fEmpty               = ( 0, "none")
+    fBlank               = ( 1, "blank")
+    fDoor                = (20, "open door")
+    fLockedDoor          = (21, "locked door")
+    fArchway             = (22, "archway")
+    fSecretDoorBlock     = (23, "secret door (block)")
+    fSecretDoor          = (24, "secret door")
+    fOneWayDoor1         = (25, "one-way door")
+    fOneWayDoor2         = (26, "one-way door")
+    fPressurePlate       = (30, "pressure plate")
+    fHiddenPressurePlate = (31, "hidden pressure plate")
+    fClosedPit           = (40, "closed pit")
+    fOpenPit             = (41, "open pit")
+    fHiddenPit           = (42, "hidden pit")
+    fCeilingPit          = (43, "ceiling pit")
+    fStairsDown          = (50, "stairs down")
+    fStairsUp            = (51, "stairs up")
+    fEntranceDoor        = (52, "entrance door")
+    fExitDoor            = (53, "exit door")
+    fSpinner             = (60, "spinner")
+    fTeleportSource      = (70, "teleport")
+    fTeleportDestination = (71, "teleport destination")
     fInvisibleBarrier    = (80, "invisible barrier")
     fBridge              = (90, "bridge")
     fColumn              = (100, "column")
@@ -259,20 +259,20 @@ type
 
 type
   LineWidth* = enum
-    lwThin   = (0, "Thin"),
+    lwThin   = (0, "Thin")
     lwNormal = (1, "Normal")
 
   GridStyle* = enum
-    gsNone   = (0, "None"),
-    gsSolid  = (1, "Solid"),
-    gsLoose  = (2, "Loose"),
+    gsNone   = (0, "None")
+    gsSolid  = (1, "Solid")
+    gsLoose  = (2, "Loose")
     gsCross  = (3, "Cross")
 
   OutlineStyle* = enum
-    osNone                = (0, "None"),
-    osCell                = (1, "Cell"),
-    osSquareEdges         = (2, "Square Edges"),
-    osRoundedEdges        = (3, "Rounded Edges"),
+    osNone                = (0, "None")
+    osCell                = (1, "Cell")
+    osSquareEdges         = (2, "Square Edges")
+    osRoundedEdges        = (3, "Rounded Edges")
     osRoundedEdgesFilled  = (4, "Filled Rounded Edges")
 
   OutlineFillStyle* = enum

diff --git a/src/hocon.nim b/src/hocon.nim
@@ -61,20 +61,20 @@ proc close(s) =
 
 type
   TokenKind = enum
-    tkLeftBrace    = (0,  "left brace ('{')"),
-    tkRightBrace   = (1,  "right brace ('}')"),
-    tkLeftBracket  = (2,  "left bracket ('[')"),
-    tkRightBracket = (3,  "right bracket (']')"),
-    tkComma        = (4,  "comma (',')"),
-    tkNewline      = (5,  "newline"),
-    # TODO tkWhitespace
-    tkColon        = (6,  "colon (':')"),
-    tkEquals       = (7,  "equals sign ('=')"),
-    tkString       = (8,  "string"),
-    tkNumber       = (9,  "number"),
-    tkTrue         = (10, "true"),
-    tkFalse        = (11, "false"),
-    tkNull         = (12, "null")
+    tkLeftBrace    = "left brace ('{')"
+    tkRightBrace   = "right brace ('}')"
+    tkLeftBracket  = "left bracket ('[')"
+    tkRightBracket = "right bracket (']')"
+    tkComma        = "comma (',')"
+    tkNewline      = "newline"
+    # TODO tkWhitespa
+    tkColon        = "colon (':')"
+    tkEquals       = "equals sign ('=')"
+    tkString       = "string"
+    tkNumber       = "number"
+    tkTrue         = "true"
+    tkFalse        = "false"
+    tkNull         = "null"
 
   Token = object
     case kind: TokenKind
@@ -322,12 +322,12 @@ type
   HoconParseError* = object of IOError
 
   HoconNodeKind* = enum
-    hnkNull   = (0, "null"),
-    hnkString = (1, "string"),
-    hnkNumber = (2, "number"),
-    hnkBool   = (3, "bool"),
-    hnkObject = (4, "object"),
-    hnkArray  = (5, "array")
+    hnkNull   = "null"
+    hnkString = "string"
+    hnkNumber = "number"
+    hnkBool   = "bool"
+    hnkObject = "object"
+    hnkArray  = "array"
 
   HoconNode* = ref HoconNodeObj