revised mapping ops

spec.burnbar

@@ -19,7 +19,8 @@
 - # Type grammar
 - type → array-type | dictionary-type | type-identifier | optional-type | primitive-type
 - returnType → type-identifier | Void
-- primitive-type → String | Int | Float | Bool | NSNumber
+- primitive-type → String | NSNumber | overloaded
+- overloaded → Int | Float | Bool | NSDate
 - array-type → [ type ]
 - dictionary-type → { String : type }
 - optional-type → type ?

src/BurningBar.hs

@@ -26,15 +26,15 @@ main = do
   let write = (∘ copy) ∘ writeFile ∘ (root </>)
   spec ← readFile spec
   let errors = check spec in when (errors ≠ []) (error errors)
-  let (ent, int) = translator (swift shield transport interface) (parse spec)
+  let (ent, int) = translator (swift overload transport interface) (parse spec)
   (createDir root ≫ write entFn ent ≫ write intFn int)
       `catch` handleEx
 #ifdef DEBUG
   print (spec, ent, int)
 #endif
 
 data Options = Options { transport ∷ Typename, interface ∷ Typename , spec ∷ String
-                       , root ∷ FilePath, entFn ∷ FilePath, intFn ∷ FilePath, shield ∷ Bool}
+                       , root ∷ FilePath, entFn ∷ FilePath, intFn ∷ FilePath, overload ∷ Bool}
 
 defaults = Options "Transport" "Interface" "spec.burnbar" "./" entFn intFn False
   where { intFn = "Interface.swift"; entFn = "Entities.swift" }
@@ -47,8 +47,8 @@ options = let opt (k, f, a, h) = Option k f a h in map opt
   , ("i", ["interface-file"], ReqArg (\a o → o {intFn = a}) "Interface.swift", "interface out filename")
   , ("r", ["entities-file"], ReqArg (\a o → o {entFn = a}) "Entities.swift", "entities out filename")
   , ("s", ["spec-file"], ReqArg (\a o → o {spec = a}) "spec.burnbar", "input spec file")
-  , ("b", ["dynamicity-shield"], NoArg (\o → o {shield = True}), "accept weak-typed json")
-  , ("f", ["fucking-string"], NoArg (\o → o {shield = True}), "accept weak-typed json")
+  , ("b", ["overload"], NoArg (\o → o {overload = True}), "accept weak-typed json")
+  , ("f", ["fucking-string"], NoArg (\o → o {overload = True}), "accept weak-typed json")
   , ("p", ["path"], ReqArg (\a o → o {root = a}) ".", "output path prefix") ]
 
 use _ = error $ usageInfo ("Usage: burningbar [-vtnirsbfpcd]\n" ⧺ bbURL ⧺ version) options

src/Checker.hs

@@ -37,14 +37,17 @@ validHeadOrProto (Proto (n, rrt, nm)) = validName nm
 validName nm = if all isSwiftId nm then Nothing
                else Just ("invalid name " ⧺ nm)
 isSwiftId c = isAlphaNum c ∨ (c ≡ '_')
-validSuper sup = if all isAlphaNum names then Nothing
+validSuper sup = if all isSwiftId names then Nothing
                  else Just ("invalid proto " ⧺ fromJust sup)
   where names = separateBy ',' (fromMaybe [] sup) ≫= trim
+
 validType (Dictionary k _) = if k ≠ TypeName "String"
                              then Just ("not String key found (" ⧺ show k ⧺ ")")
                              else Nothing
+validType (TypeName t) = validName t
 validType _ = Nothing
 
+
 check ∷ String → String
 check = (≫= valid) ∘ enumerateLines
   where valid = second (validSpecLine ∘ parseLine) ⋙ printError
@@ -57,7 +60,6 @@ printError (n, Just error) = printf "spec line %03d: %s.\n" n error
 printError _ = ""
 
 -- TODO:
--- only optional newtypes in recs
 -- no optionals in met args
 -- validate paragraphs or ignore?
 -- check matching parens

src/Swift.hs

@@ -9,9 +9,9 @@ import Language hiding (generate)
 import Util
 
 swift ∷ Bool → Typename → Typename → Language
-swift shield transport interface = Language generate wrapEnts (intDefs transport interface)
+swift overload transport interface = Language generate wrapEnts (intDefs transport interface)
   where wrapEnts e = "\nimport Foundation\n" ⧺ e ⧺ entDefs
-                     ⧺ if shield then dynamicityShield else []
+                     ⧺ if overload then overloaded else []
 
 generate ∷ Declaration → String
 generate (Record name vars super) = struct name vars super