Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Hayley Patton
netfarm
Commits
514a715f
Commit
514a715f
authored
Mar 20, 2020
by
Hayley Patton
🐢
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
COMPUTE-DEPENDENCIES returns string hashes, fix inconsistencies in renderers
parent
0b4df228
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
5 deletions
+10
-5
Code/Objects/objects.lisp
Code/Objects/objects.lisp
+1
-1
Code/Text-format/new-renderer.lisp
Code/Text-format/new-renderer.lisp
+9
-4
No files found.
Code/Objects/objects.lisp
View file @
514a715f
...
...
@@ -74,7 +74,7 @@
(
list
(
vague-object-schema-name
vague-object
))
(
let
((
reference-hashes
'
()))
(
map-references
(
lambda
(
reference
)
(
push
(
reference-hash
reference
)
(
push
(
bytes->base64
(
reference-hash
reference
)
)
reference-hashes
))
vague-object
)
reference-hashes
)
...
...
Code/Text-format/new-renderer.lisp
View file @
514a715f
...
...
@@ -55,7 +55,9 @@
(
render-to-stream
(
computed-value-value
computed-value
)
stream
)
(
write-char
#\)
stream
)
(
write-char
(
if
more?
#\Space
#\)
)
stream
))))
(
when
more?
(
write-char
#\Space
stream
)))
(
write-char
#\)
stream
)))
(
let*
((
class
(
class-of
object
))
(
table
(
netfarm-class-computed-slot-table
class
))
(
slots
(
sort
(
string-hash-table->alist
table
)
...
...
@@ -99,7 +101,8 @@ string; but RENDER-OBJECT will emit Netfarm standard format text."))
(
setf
(
gethash
"schema"
(
object-metadata
object
))
(
netfarm-class-name
(
class-of
object
)))
(
render-hash-table
(
object-metadata
object
)
stream
)
(
terpri
stream
)
(
unless
(
zerop
(
hash-table-count
(
object-metadata
object
)))
(
terpri
stream
))
(
write-line
"---"
stream
)
(
render-slots
object
stream
)
(
when
emit-computed-values
...
...
@@ -113,10 +116,12 @@ string; but RENDER-OBJECT will emit Netfarm standard format text."))
stream
))
(
write-line
"---"
stream
)
(
render-hash-table
(
vague-object-metadata
object
)
stream
)
(
terpri
stream
)
(
unless
(
zerop
(
hash-table-count
(
vague-object-metadata
object
)))
(
terpri
stream
))
(
write-line
"---"
stream
)
(
render-hash-table
(
vague-object-values
object
)
stream
)
(
terpri
stream
)
(
unless
(
zerop
(
hash-table-count
(
vague-object-values
object
)))
(
terpri
stream
))
(
when
emit-computed-values
(
maybe-write-vague-computed-values
object
stream
)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment