Reformat after capitalization of type literals fixed

Author: rdaum

src/block.moo

@@ -14,9 +14,9 @@ object BLOCK
     result = {};
     for line_no in [1..length(this)]
       content = this[line_no];
-      if (typeof(content) == str)
+      if (typeof(content) == STR)
         result = {@result, content};
-      elseif (typeof(content) == flyweight)
+      elseif (typeof(content) == FLYWEIGHT)
         result = {@result, content:render_as(@args)};
       else
         raise(E_TYPE);

src/event.moo

@@ -29,12 +29,12 @@ object EVENT
     endif
     results = {};
     for entry in (this)
-      if (typeof(entry) == flyweight)
+      if (typeof(entry) == FLYWEIGHT)
         entry = entry:render_as(render_for, content_type, this);
       endif
-      if (typeof(entry) == str)
+      if (typeof(entry) == STR)
         results = entry:append_to_paragraph(@results);
-      elseif (typeof(entry) == list)
+      elseif (typeof(entry) == LIST)
         for index in [1..length(entry)]
           results = {@(entry[index]):append_to_paragraph(@results)};
           if (index != length(entry))
@@ -50,7 +50,7 @@ object EVENT
 
   verb validate (this none this) owner: HACKER flags: "rxd"
     "Validate that the event has all the correct fields. Return false if not.";
-    if (typeof(this) != flyweight)
+    if (typeof(this) != FLYWEIGHT)
       return false;
     endif
     try

src/list.moo

@@ -24,7 +24,7 @@ object LIST
     for t in (lst)
       if (t[indx] == target)
         "... do this test first since it's the most likely to fail; this needs -d";
-        if (typeof(t) == list && length(t) >= indx)
+        if (typeof(t) == LIST && length(t) >= indx)
           return t;
         endif
       endif
@@ -36,7 +36,7 @@ object LIST
     "assoc_prefix(list, target[,index]) returns the first element of `list' whose own index-th element has target as a prefix.  Index defaults to 1.";
     {lst, target, ?indx = 1} = args;
     for t in (lst)
-      if (typeof(t) == list && (length(t) >= indx && index(t[indx], target) == 1))
+      if (typeof(t) == LIST && (length(t) >= indx && index(t[indx], target) == 1))
         return t;
       endif
     endfor
@@ -48,7 +48,7 @@ object LIST
     "Make sure all elements of <list> are of a given <type>.";
     "<type> can be either one of LIST, STR, OBJ, NUM, ERR, or a list of same.";
     "return true if all elements check, otherwise 0.";
-    typelist = typeof(args[2]) == list ? args[2] | {args[2]};
+    typelist = typeof(args[2]) == LIST ? args[2] | {args[2]};
     for element in (args[1])
       if (!(typeof(element) in typelist))
         return false;

src/look.moo

@@ -42,7 +42,7 @@ object LOOK
   endverb
 
   verb validate (this none this) owner: HACKER flags: "rxd"
-    if (typeof(this) != flyweight)
+    if (typeof(this) != FLYWEIGHT)
       return false;
     endif
     try
@@ -58,10 +58,10 @@ object LOOK
     !look:validate() && raise(E_ASSERT, "Invalid $look: " + toliteral(look));
     event = look:into_event();
     !event:validate() && raise(E_ASSERT, "Invalid event");
-    !(typeof(event) == flyweight) && raise(E_ASSERT, "look event should be a flyweight");
+    !(typeof(event) == FLYWEIGHT) && raise(E_ASSERT, "look event should be a flyweight");
     event.dobj != $first_room && raise(E_ASSERT, "look event dobj is wrong");
     content = event:transform_for(player);
-    typeof(content) != list && raise(E_ASSERT, "Produced content is invalid: " + toliteral(content));
+    typeof(content) != LIST && raise(E_ASSERT, "Produced content is invalid: " + toliteral(content));
     length(content) != 3 && raise(E_ASSERT, "Produced content is wrong length: " + toliteral(content) + " from " + toliteral(event));
   endverb
 endobject

src/password.moo

@@ -6,14 +6,14 @@ object PASSWORD
 
   verb mk (this none this) owner: ARCH_WIZARD flags: "rxd"
     "mk(password) => <$password, { <encrypted_password> }>; return an argon2 encrypted password";
-    if (typeof(this) == flyweight)
+    if (typeof(this) == FLYWEIGHT)
       raise(E_INVARG);
     endif
     if (length(args) != 1)
       raise(E_ARGS);
     endif
     {password} = args;
-    if (typeof(password) != str)
+    if (typeof(password) != STR)
       raise(E_INVARG);
     endif
     salt_str = salt();
@@ -22,15 +22,15 @@ object PASSWORD
   endverb
 
   verb challenge (this none this) owner: ARCH_WIZARD flags: "rxd"
-    if (typeof(this) != flyweight)
+    if (typeof(this) != FLYWEIGHT)
       raise(E_INVARG);
     endif
     if (length(args) != 1)
       raise(E_ARGS);
     endif
     {password} = args;
     encrypted = this[1];
-    if (typeof(encrypted) != str)
+    if (typeof(encrypted) != STR)
       raise(E_PERM);
     endif
     return argon2_verify(encrypted, password);

src/player.moo

@@ -43,17 +43,17 @@ object PLAYER
   verb tell (this none this) owner: ARCH_WIZARD flags: "rxd"
     set_task_perms(this);
     {events, ?content_type = "text/plain"} = args;
-    if (typeof(events) != list)
+    if (typeof(events) != LIST)
       events = {events};
     endif
     for event in (events)
       if (typeof(event) == STR)
-         content = event;
+        content = event;
       else
-         !event:validate() && raise(E_INVARG);
-         content = event:transform_for(this, content_type);
+        !event:validate() && raise(E_INVARG);
+        content = event:transform_for(this, content_type);
       endif
-      if (typeof(content) == list)
+      if (typeof(content) == LIST)
         { notify(this, line, content_type) for line in (content) };
       else
         notify(this, content, content_type);

src/string.moo

@@ -80,7 +80,7 @@ object STRING
           break properties;
         endif
       endwhile
-      if (typeof(object) == obj)
+      if (typeof(object) == OBJ)
         return object;
       else
         return $failed_match;
@@ -99,7 +99,7 @@ object STRING
     "space(len,fill) returns a string of length abs(len) consisting of copies of fill.  If len is negative, fill is anchored on the right instead of the left.";
     "len has an upper limit of 100,000.";
     {n, ?fill = " "} = args;
-    if (typeof(n) == str)
+    if (typeof(n) == STR)
       n = length(n);
     endif
     if ((n = abs(n)) > 100000)
@@ -284,7 +284,7 @@ object STRING
     !(object && verbname) && return false;
     if (object[1] == "$" && 0)
       pname = object[2..length(object)];
-      if (!(pname in properties(#0)) || typeof(object = #0.(pname)) != obj)
+      if (!(pname in properties(#0)) || typeof(object = #0.(pname)) != OBJ)
         return false;
       endif
       object = tostr(object);