jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libffi: style changes

Browse source
This commit is contained in:
Araq 2019-06-19 16:54:26 +02:00
commit ff89f7e33a
1 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

98
lib/js/jsffi.nim
View file

@ -19,10 +19,10 @@
## # whole library: ## # whole library:
## ##
## # import the document object and the console ## # import the document object and the console
## var document {. importc, nodecl .}: JsObject ## var document {.importc, nodecl.}: JsObject
## var console {. importc, nodecl .}: JsObject ## var console {.importc, nodecl.}: JsObject
## # import the "$" function ## # import the "$" function
## proc jq(selector: JsObject): JsObject {. importcpp: "$(#)" .} ## proc jq(selector: JsObject): JsObject {.importcpp: "$(#)".}
## ##
## # Use jQuery to make the following code run, after the document is ready. ## # Use jQuery to make the following code run, after the document is ready.
## # This uses an experimental ``.()`` operator for ``JsObject``, to emit ## # This uses an experimental ``.()`` operator for ``JsObject``, to emit
@ -43,8 +43,8 @@ const
getImpl = "#[#]" getImpl = "#[#]"
var var
mangledNames {. compileTime .} = initTable[string, string]() mangledNames {.compileTime.} = initTable[string, string]()
nameCounter {. compileTime .} = 0 nameCounter {.compileTime.} = 0
proc validJsName(name: string): bool = proc validJsName(name: string): bool =
result = true result = true
@ -122,18 +122,18 @@ type
JsURIError* {.importc: "URIError".} = object of JsError JsURIError* {.importc: "URIError".} = object of JsError
# New # New
proc newJsObject*: JsObject {. importcpp: "{@}" .} proc newJsObject*: JsObject {.importcpp: "{@}".}
## Creates a new empty JsObject ## Creates a new empty JsObject
proc newJsAssoc*[K: JsKey, V]: JsAssoc[K, V] {. importcpp: "{@}" .} proc newJsAssoc*[K: JsKey, V]: JsAssoc[K, V] {.importcpp: "{@}".}
## Creates a new empty JsAssoc with key type `K` and value type `V`. ## Creates a new empty JsAssoc with key type `K` and value type `V`.
# Checks # Checks
proc hasOwnProperty*(x: JsObject, prop: cstring): bool proc hasOwnProperty*(x: JsObject, prop: cstring): bool
{. importcpp: "#.hasOwnProperty(#)" .} {.importcpp: "#.hasOwnProperty(#)".}
## Checks, whether `x` has a property of name `prop`. ## Checks, whether `x` has a property of name `prop`.
proc jsTypeOf*(x: JsObject): cstring {. importcpp: "typeof(#)" .} proc jsTypeOf*(x: JsObject): cstring {.importcpp: "typeof(#)".}
## Returns the name of the JsObject's JavaScript type as a cstring. ## Returns the name of the JsObject's JavaScript type as a cstring.
proc jsNew*(x: auto): JsObject {.importcpp: "(new #)".} proc jsNew*(x: auto): JsObject {.importcpp: "(new #)".}
@ -147,10 +147,10 @@ proc require*(module: cstring): JsObject {.importc.}
## JavaScript's `require` function ## JavaScript's `require` function
# Conversion to and from JsObject # Conversion to and from JsObject
proc to*(x: JsObject, T: typedesc): T {. importcpp: "(#)" .} proc to*(x: JsObject, T: typedesc): T {.importcpp: "(#)".}
## Converts a JsObject `x` to type `T`. ## Converts a JsObject `x` to type `T`.
proc toJs*[T](val: T): JsObject {. importcpp: "(#)" .} proc toJs*[T](val: T): JsObject {.importcpp: "(#)".}
## Converts a value of any type to type JsObject ## Converts a value of any type to type JsObject
template toJs*(s: string): JsObject = cstring(s).toJs template toJs*(s: string): JsObject = cstring(s).toJs
@ -164,45 +164,45 @@ macro jsFromAst*(n: untyped): untyped =
proc `&`*(a, b: cstring): cstring {.importcpp: "(# + #)".} proc `&`*(a, b: cstring): cstring {.importcpp: "(# + #)".}
## Concatenation operator for JavaScript strings ## Concatenation operator for JavaScript strings
proc `+` *(x, y: JsObject): JsObject {. importcpp: "(# + #)" .} proc `+` *(x, y: JsObject): JsObject {.importcpp: "(# + #)".}
proc `-` *(x, y: JsObject): JsObject {. importcpp: "(# - #)" .} proc `-` *(x, y: JsObject): JsObject {.importcpp: "(# - #)".}
proc `*` *(x, y: JsObject): JsObject {. importcpp: "(# * #)" .} proc `*` *(x, y: JsObject): JsObject {.importcpp: "(# * #)".}
proc `/` *(x, y: JsObject): JsObject {. importcpp: "(# / #)" .} proc `/` *(x, y: JsObject): JsObject {.importcpp: "(# / #)".}
proc `%` *(x, y: JsObject): JsObject {. importcpp: "(# % #)" .} proc `%` *(x, y: JsObject): JsObject {.importcpp: "(# % #)".}
proc `+=` *(x, y: JsObject): JsObject {. importcpp: "(# += #)", discardable .} proc `+=` *(x, y: JsObject): JsObject {.importcpp: "(# += #)", discardable.}
proc `-=` *(x, y: JsObject): JsObject {. importcpp: "(# -= #)", discardable .} proc `-=` *(x, y: JsObject): JsObject {.importcpp: "(# -= #)", discardable.}
proc `*=` *(x, y: JsObject): JsObject {. importcpp: "(# *= #)", discardable .} proc `*=` *(x, y: JsObject): JsObject {.importcpp: "(# *= #)", discardable.}
proc `/=` *(x, y: JsObject): JsObject {. importcpp: "(# /= #)", discardable .} proc `/=` *(x, y: JsObject): JsObject {.importcpp: "(# /= #)", discardable.}
proc `%=` *(x, y: JsObject): JsObject {. importcpp: "(# %= #)", discardable .} proc `%=` *(x, y: JsObject): JsObject {.importcpp: "(# %= #)", discardable.}
proc `++` *(x: JsObject): JsObject {. importcpp: "(++#)" .} proc `++` *(x: JsObject): JsObject {.importcpp: "(++#)".}
proc `--` *(x: JsObject): JsObject {. importcpp: "(--#)" .} proc `--` *(x: JsObject): JsObject {.importcpp: "(--#)".}
proc `>` *(x, y: JsObject): JsObject {. importcpp: "(# > #)" .} proc `>` *(x, y: JsObject): JsObject {.importcpp: "(# > #)".}
proc `<` *(x, y: JsObject): JsObject {. importcpp: "(# < #)" .} proc `<` *(x, y: JsObject): JsObject {.importcpp: "(# < #)".}
proc `>=` *(x, y: JsObject): JsObject {. importcpp: "(# >= #)" .} proc `>=` *(x, y: JsObject): JsObject {.importcpp: "(# >= #)".}
proc `<=` *(x, y: JsObject): JsObject {. importcpp: "(# <= #)" .} proc `<=` *(x, y: JsObject): JsObject {.importcpp: "(# <= #)".}
proc `and`*(x, y: JsObject): JsObject {. importcpp: "(# && #)" .} proc `and`*(x, y: JsObject): JsObject {.importcpp: "(# && #)".}
proc `or` *(x, y: JsObject): JsObject {. importcpp: "(# || #)" .} proc `or` *(x, y: JsObject): JsObject {.importcpp: "(# || #)".}
proc `not`*(x: JsObject): JsObject {. importcpp: "(!#)" .} proc `not`*(x: JsObject): JsObject {.importcpp: "(!#)".}
proc `in` *(x, y: JsObject): JsObject {. importcpp: "(# in #)" .} proc `in` *(x, y: JsObject): JsObject {.importcpp: "(# in #)".}
proc `[]`*(obj: JsObject, field: cstring): JsObject {. importcpp: getImpl .} proc `[]`*(obj: JsObject, field: cstring): JsObject {.importcpp: getImpl.}
## Return the value of a property of name `field` from a JsObject `obj`. ## Return the value of a property of name `field` from a JsObject `obj`.
proc `[]`*(obj: JsObject, field: int): JsObject {. importcpp: getImpl .} proc `[]`*(obj: JsObject, field: int): JsObject {.importcpp: getImpl.}
## Return the value of a property of name `field` from a JsObject `obj`. ## Return the value of a property of name `field` from a JsObject `obj`.
proc `[]=`*[T](obj: JsObject, field: cstring, val: T) {. importcpp: setImpl .} proc `[]=`*[T](obj: JsObject, field: cstring, val: T) {.importcpp: setImpl.}
## Set the value of a property of name `field` in a JsObject `obj` to `v`. ## Set the value of a property of name `field` in a JsObject `obj` to `v`.
proc `[]=`*[T](obj: JsObject, field: int, val: T) {. importcpp: setImpl .} proc `[]=`*[T](obj: JsObject, field: int, val: T) {.importcpp: setImpl.}
## Set the value of a property of name `field` in a JsObject `obj` to `v`. ## Set the value of a property of name `field` in a JsObject `obj` to `v`.
proc `[]`*[K: JsKey, V](obj: JsAssoc[K, V], field: K): V proc `[]`*[K: JsKey, V](obj: JsAssoc[K, V], field: K): V
{. importcpp: getImpl .} {.importcpp: getImpl.}
## Return the value of a property of name `field` from a JsAssoc `obj`. ## Return the value of a property of name `field` from a JsAssoc `obj`.
proc `[]=`*[K: JsKey, V](obj: JsAssoc[K, V], field: K, val: V) proc `[]=`*[K: JsKey, V](obj: JsAssoc[K, V], field: K, val: V)
{. importcpp: setImpl .} {.importcpp: setImpl.}
## Set the value of a property of name `field` in a JsAssoc `obj` to `v`. ## Set the value of a property of name `field` in a JsAssoc `obj` to `v`.
proc `[]`*[V](obj: JsAssoc[cstring, V], field: string): V = proc `[]`*[V](obj: JsAssoc[cstring, V], field: string): V =
@ -211,12 +211,12 @@ proc `[]`*[V](obj: JsAssoc[cstring, V], field: string): V =
proc `[]=`*[V](obj: JsAssoc[cstring, V], field: string, val: V) = proc `[]=`*[V](obj: JsAssoc[cstring, V], field: string, val: V) =
obj[cstring(field)] = val obj[cstring(field)] = val
proc `==`*(x, y: JsRoot): bool {. importcpp: "(# === #)" .} proc `==`*(x, y: JsRoot): bool {.importcpp: "(# === #)".}
## Compare two JsObjects or JsAssocs. Be careful though, as this is comparison ## Compare two JsObjects or JsAssocs. Be careful though, as this is comparison
## like in JavaScript, so if your JsObjects are in fact JavaScript Objects, ## like in JavaScript, so if your JsObjects are in fact JavaScript Objects,
## and not strings or numbers, this is a *comparison of references*. ## and not strings or numbers, this is a *comparison of references*.
{. experimental .} {.experimental.}
macro `.`*(obj: JsObject, field: untyped): JsObject = macro `.`*(obj: JsObject, field: untyped): JsObject =
## Experimental dot accessor (get) for type JsObject. ## Experimental dot accessor (get) for type JsObject.
## Returns the value of a property of name `field` from a JsObject `x`. ## Returns the value of a property of name `field` from a JsObject `x`.
@ -232,7 +232,7 @@ macro `.`*(obj: JsObject, field: untyped): JsObject =
let importString = "#." & $field let importString = "#." & $field
result = quote do: result = quote do:
proc helper(o: JsObject): JsObject proc helper(o: JsObject): JsObject
{. importcpp: `importString`, gensym .} {.importcpp: `importString`, gensym.}
helper(`obj`) helper(`obj`)
else: else:
if not mangledNames.hasKey($field): if not mangledNames.hasKey($field):
@ -240,7 +240,7 @@ macro `.`*(obj: JsObject, field: untyped): JsObject =
let importString = "#." & mangledNames[$field] let importString = "#." & mangledNames[$field]
result = quote do: result = quote do:
proc helper(o: JsObject): JsObject proc helper(o: JsObject): JsObject
{. importcpp: `importString`, gensym .} {.importcpp: `importString`, gensym.}
helper(`obj`) helper(`obj`)
macro `.=`*(obj: JsObject, field, value: untyped): untyped = macro `.=`*(obj: JsObject, field, value: untyped): untyped =
@ -250,7 +250,7 @@ macro `.=`*(obj: JsObject, field, value: untyped): untyped =
let importString = "#." & $field & " = #" let importString = "#." & $field & " = #"
result = quote do: result = quote do:
proc helper(o: JsObject, v: auto) proc helper(o: JsObject, v: auto)
{. importcpp: `importString`, gensym .} {.importcpp: `importString`, gensym.}
helper(`obj`, `value`) helper(`obj`, `value`)
else: else:
if not mangledNames.hasKey($field): if not mangledNames.hasKey($field):
@ -258,7 +258,7 @@ macro `.=`*(obj: JsObject, field, value: untyped): untyped =
let importString = "#." & mangledNames[$field] & " = #" let importString = "#." & mangledNames[$field] & " = #"
result = quote do: result = quote do:
proc helper(o: JsObject, v: auto) proc helper(o: JsObject, v: auto)
{. importcpp: `importString`, gensym .} {.importcpp: `importString`, gensym.}
helper(`obj`, `value`) helper(`obj`, `value`)
macro `.()`*(obj: JsObject, macro `.()`*(obj: JsObject,
@ -275,7 +275,7 @@ macro `.()`*(obj: JsObject,
## .. code-block:: nim ## .. code-block:: nim
## ##
## # Let's get back to the console example: ## # Let's get back to the console example:
## var console {. importc, nodecl .}: JsObject ## var console {.importc, nodecl.}: JsObject
## let res = console.log("I return undefined!") ## let res = console.log("I return undefined!")
## console.log(res) # This prints undefined, as console.log always returns ## console.log(res) # This prints undefined, as console.log always returns
## # undefined. Thus one has to be careful, when using ## # undefined. Thus one has to be careful, when using
@ -289,7 +289,7 @@ macro `.()`*(obj: JsObject,
importString = "#." & mangledNames[$field] & "(@)" importString = "#." & mangledNames[$field] & "(@)"
result = quote: result = quote:
proc helper(o: JsObject): JsObject proc helper(o: JsObject): JsObject
{. importcpp: `importString`, gensym, discardable .} {.importcpp: `importString`, gensym, discardable.}
helper(`obj`) helper(`obj`)
for idx in 0 ..< args.len: for idx in 0 ..< args.len:
let paramName = newIdentNode(!("param" & $idx)) let paramName = newIdentNode(!("param" & $idx))
@ -309,7 +309,7 @@ macro `.`*[K: cstring, V](obj: JsAssoc[K, V],
importString = "#." & mangledNames[$field] importString = "#." & mangledNames[$field]
result = quote do: result = quote do:
proc helper(o: type(`obj`)): `obj`.V proc helper(o: type(`obj`)): `obj`.V
{. importcpp: `importString`, gensym .} {.importcpp: `importString`, gensym.}
helper(`obj`) helper(`obj`)
macro `.=`*[K: cstring, V](obj: JsAssoc[K, V], macro `.=`*[K: cstring, V](obj: JsAssoc[K, V],
@ -326,7 +326,7 @@ macro `.=`*[K: cstring, V](obj: JsAssoc[K, V],
importString = "#." & mangledNames[$field] & " = #" importString = "#." & mangledNames[$field] & " = #"
result = quote do: result = quote do:
proc helper(o: type(`obj`), v: `obj`.V) proc helper(o: type(`obj`), v: `obj`.V)
{. importcpp: `importString`, gensym .} {.importcpp: `importString`, gensym.}
helper(`obj`, `value`) helper(`obj`, `value`)
macro `.()`*[K: cstring, V: proc](obj: JsAssoc[K, V], macro `.()`*[K: cstring, V: proc](obj: JsAssoc[K, V],
@ -423,7 +423,7 @@ macro `{}`*(typ: typedesc, xs: varargs[untyped]): auto =
## let obj = ExtremelyHugeType{ a: 1, k: "foo".cstring, d: 42 } ## let obj = ExtremelyHugeType{ a: 1, k: "foo".cstring, d: 42 }
## ##
## # This generates roughly the same JavaScript as: ## # This generates roughly the same JavaScript as:
## {. emit: "var obj = {a: 1, k: "foo", d: 42};" .} ## {.emit: "var obj = {a: 1, k: "foo", d: 42};".}
## ##
let a = !"a" let a = !"a"
var body = quote do: var body = quote do:
@ -498,7 +498,7 @@ macro bindMethod*(procedure: typed): auto =
this = newIdentNode("this") this = newIdentNode("this")
# construct the `this` parameter: # construct the `this` parameter:
thisQuote = quote do: thisQuote = quote do:
var `this` {. nodecl, importc .} : `thisType` var `this` {.nodecl, importc.} : `thisType`
call = newNimNode(nnkCall).add(rawProc[0], thisQuote[0][0][0]) call = newNimNode(nnkCall).add(rawProc[0], thisQuote[0][0][0])
# construct the procedure call inside the method # construct the procedure call inside the method
if args.len > 2: if args.len > 2: