diff options
| author | zhiayang <zhiayang@gmail.com> | 2017-02-02 04:21:42 +0800 |
|---|---|---|
| committer | zhiayang <zhiayang@gmail.com> | 2017-02-02 04:21:42 +0800 |
| commit | 5516e80ab775d1100beca7847e10520eae4b151c (patch) | |
| tree | fd080deab099e74ec5f50841c6a8b5b5b8b5c3c4 /code | |
| parent | 864310e3da059371ac7345ee3bf900a6055f26b4 (diff) | |
| parent | 4e7082a68dd5261c3c36eccf92a62a0ce84995a8 (diff) | |
Merge branch 'master' of https://github.com/zhiayang/Odin
Diffstat (limited to 'code')
| -rw-r--r-- | code/demo.odin | 10 | ||||
| -rw-r--r-- | code/old_demos/demo001.odin | 33 |
2 files changed, 28 insertions, 15 deletions
diff --git a/code/demo.odin b/code/demo.odin index 61516e5b7..805a9690b 100644 --- a/code/demo.odin +++ b/code/demo.odin @@ -1,6 +1,16 @@ #import "fmt.odin"; +#import "atomic.odin"; +#import "hash.odin"; +#import "math.odin"; +#import "mem.odin"; +#import "opengl.odin"; +#import "os.odin"; +#import "sync.odin"; +#import "utf8.odin"; main :: proc() { + i: int; + x: [dynamic]f64; defer free(x); append(^x, 2_000_000.500_000, 3, 5, 7); diff --git a/code/old_demos/demo001.odin b/code/old_demos/demo001.odin index 7e80f0d1b..c3fc0f663 100644 --- a/code/old_demos/demo001.odin +++ b/code/old_demos/demo001.odin @@ -6,21 +6,24 @@ // #import "punity.odin" as pn; main :: proc() { - // struct_padding() - // bounds_checking() - // type_introspection() - // any_type() - // crazy_introspection() - // namespaces_and_files() - // miscellany() - // ht.run() - // game.run() - // { - // init :: proc(c: ^pn.Core) {} - // step :: proc(c: ^pn.Core) {} - - // pn.run(init, step) - // } + struct_padding(); + bounds_checking(); + type_introspection(); + any_type(); + crazy_introspection(); + namespaces_and_files(); + miscellany(); + + /* + ht.run(); + game.run(); + { + init :: proc(c: ^pn.Core) {} + step :: proc(c: ^pn.Core) {} + + pn.run(init, step); + } + */ } struct_padding :: proc() { |