Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor json macro #12391

Merged
merged 20 commits into from
Oct 17, 2019
Merged

Refactor json macro #12391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
895c5a7
something
krux02 Oct 6, 2019
3b80c40
compiles but crashes
krux02 Oct 8, 2019
73ddc84
option type works
krux02 Oct 8, 2019
3e5b514
tjsonmacro passes
krux02 Oct 8, 2019
e75ff0f
some cleanup
krux02 Oct 8, 2019
c33f415
some more cleanup
krux02 Oct 8, 2019
ca08a2c
rename, fix test, tuple error message
krux02 Oct 8, 2019
8d83726
close #12316
krux02 Oct 8, 2019
1cdd4fd
Merge branch 'devel' into refactor-json-macro
krux02 Oct 8, 2019
fca10c0
revert accidental change
krux02 Oct 9, 2019
adee966
make tjsonmacro work at js target
krux02 Oct 9, 2019
c156f1e
more cleanup
krux02 Oct 9, 2019
264746b
close #12289
krux02 Oct 9, 2019
22d6f2a
close #11988
krux02 Oct 9, 2019
832aa4e
untested
krux02 Oct 15, 2019
0e2b298
Merge branch 'devel' into refactor-json-macro
krux02 Oct 15, 2019
03d96e6
add test
krux02 Oct 15, 2019
978c1f7
also fixed gdb related stuff
krux02 Oct 15, 2019
b44bddc
fixed bootstrapping
krux02 Oct 15, 2019
28fa645
delete debug leftover
krux02 Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions compiler/condsyms.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,4 @@ proc initDefines*(symbols: StringTableRef) =
defineSymbol("nimHasStyleChecks")
defineSymbol("nimToOpenArrayCString")
defineSymbol("nimHasUsed")
defineSymbol("nimFixedForwardGeneric")
13 changes: 10 additions & 3 deletions compiler/types.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1121,9 +1121,16 @@ proc sameTypeAux(x, y: PType, c: var TSameTypeClosure): bool =
result = sameChildrenAux(a, b, c) and sameFlags(a, b)
if result and {ExactGenericParams, ExactTypeDescValues} * c.flags != {}:
result = a.sym.position == b.sym.position
of tyGenericInvocation, tyGenericBody, tySequence,
tyOpenArray, tySet, tyRef, tyPtr, tyVar, tyLent, tySink, tyUncheckedArray,
tyArray, tyProc, tyVarargs, tyOrdinal, tyTypeClasses, tyOpt, tyOwned:
of tyBuiltInTypeClass:
assert a.len == 1
assert a[0].len == 0
assert b.len == 1
assert b[0].len == 0
result = a[0].kind == b[0].kind
of tyGenericInvocation, tyGenericBody, tySequence, tyOpenArray, tySet, tyRef,
tyPtr, tyVar, tyLent, tySink, tyUncheckedArray, tyArray, tyProc, tyVarargs,
tyOrdinal, tyCompositeTypeClass, tyUserTypeClass, tyUserTypeClassInst,
tyAnd, tyOr, tyNot, tyAnything, tyOpt, tyOwned:
cycleCheck()
if a.kind == tyUserTypeClass and a.n != nil: return a.n == b.n
result = sameChildrenAux(a, b, c)
Expand Down
Loading