Merge branch 'master' into odin-global-constants-as-enums

3 files changed, 123 insertions, 24 deletions

diff --git a/examples/all/all_main.odin b/examples/all/all_main.odin
index c24238602..e38dd5150 100644
--- a/examples/all/all_main.odin
+++ b/examples/all/all_main.odin
@@ -5,25 +5,65 @@ package all
 
 import bufio          "core:bufio"
 import bytes          "core:bytes"
+
 import c              "core:c"
 import libc           "core:c/libc"
+
 import compress       "core:compress"
 import gzip           "core:compress/gzip"
 import zlib           "core:compress/zlib"
-import container      "core:container"
+
+import bit_array      "core:container/bit_array"
+import priority_queue "core:container/priority_queue"
+import queue          "core:container/queue"
+import small_array    "core:container/small_array"
+import lru            "core:container/lru"
+
+import crypto           "core:crypto"
+import blake            "core:crypto/blake"
+import blake2b          "core:crypto/blake2b"
+import blake2s          "core:crypto/blake2s"
+import chacha20         "core:crypto/chacha20"
+import chacha20poly1305 "core:crypto/chacha20poly1305"
+import gost             "core:crypto/gost"
+import groestl           "core:crypto/groestl"
+import haval            "core:crypto/haval"
+import jh               "core:crypto/jh"
+import keccak           "core:crypto/keccak"
+import md2              "core:crypto/md2"
+import md4              "core:crypto/md4"
+import md5              "core:crypto/md5"
+import poly1305         "core:crypto/poly1305"
+import ripemd           "core:crypto/ripemd"
+import sha1             "core:crypto/sha1"
+import sha2             "core:crypto/sha2"
+import sha3             "core:crypto/sha3"
+import shake            "core:crypto/shake"
+import sm3              "core:crypto/sm3"
+import streebog         "core:crypto/streebog"
+import tiger            "core:crypto/tiger"
+import tiger2           "core:crypto/tiger2"
+import crypto_util      "core:crypto/util"
+import whirlpool        "core:crypto/whirlpool"
+import x25519           "core:crypto/x25519"
+
 import dynlib         "core:dynlib"
-import encoding       "core:encoding"
+
 import base32         "core:encoding/base32"
 import base64         "core:encoding/base64"
 import csv            "core:encoding/csv"
 import hxa            "core:encoding/hxa"
 import json           "core:encoding/json"
+
 import fmt            "core:fmt"
 import hash           "core:hash"
+
 import image          "core:image"
 import png            "core:image/png"
+
 import io             "core:io"
 import log            "core:log"
+
 import math           "core:math"
 import big            "core:math/big"
 import bits           "core:math/bits"
@@ -32,16 +72,22 @@ import linalg         "core:math/linalg"
 import glm            "core:math/linalg/glsl"
 import hlm            "core:math/linalg/hlsl"
 import rand           "core:math/rand"
+
 import mem            "core:mem"
+// import virtual        "core:mem/virtual"
+
 import ast            "core:odin/ast"
 import doc_format     "core:odin/doc-format"
 import odin_format    "core:odin/format"
 import odin_parser    "core:odin/parser"
 import odin_printer   "core:odin/printer"
 import odin_tokenizer "core:odin/tokenizer"
+
 import os             "core:os"
+
 import slashpath      "core:path/slashpath"
 import filepath       "core:path/filepath"
+
 import reflect        "core:reflect"
 import runtime        "core:runtime"
 import slice          "core:slice"
@@ -50,9 +96,11 @@ import strconv        "core:strconv"
 import strings        "core:strings"
 import sync           "core:sync"
 import sync2          "core:sync/sync2"
+import testing        "core:testing"
 import scanner        "core:text/scanner"
 import thread         "core:thread"
 import time           "core:time"
+
 import unicode        "core:unicode"
 import utf8           "core:unicode/utf8"
 import utf16          "core:unicode/utf16"
@@ -67,9 +115,38 @@ _ :: libc
 _ :: compress
 _ :: gzip
 _ :: zlib
-_ :: container
+_ :: bit_array
+_ :: priority_queue
+_ :: queue
+_ :: small_array
+_ :: crypto
+_ :: blake
+_ :: blake2b
+_ :: blake2s
+_ :: chacha20
+_ :: chacha20poly1305
+_ :: gost
+_ :: groestl
+_ :: haval
+_ :: jh
+_ :: keccak
+_ :: md2
+_ :: md4
+_ :: md5
+_ :: poly1305
+_ :: ripemd
+_ :: sha1
+_ :: sha2
+_ :: sha3
+_ :: shake
+_ :: sm3
+_ :: streebog
+_ :: tiger
+_ :: tiger2
+_ :: crypto_util
+_ :: whirlpool
+_ :: x25519
 _ :: dynlib
-_ :: encoding
 _ :: base32
 _ :: base64
 _ :: csv
@@ -107,6 +184,7 @@ _ :: strconv
 _ :: strings
 _ :: sync
 _ :: sync2
+_ :: testing
 _ :: scanner
 _ :: thread
 _ :: time
diff --git a/examples/all/all_vendor.odin b/examples/all/all_vendor.odin
index 777c184f9..f94e092af 100644
--- a/examples/all/all_vendor.odin
+++ b/examples/all/all_vendor.odin
@@ -1,26 +1,47 @@
 //+build windows
 package all
 
-import glfw   "vendor:glfw"
-import gl     "vendor:OpenGL"
-import rl     "vendor:raylib"
-import PM     "vendor:portmidi"
+
+import botan     "vendor:botan"
+import ENet      "vendor:ENet"
+import gl        "vendor:OpenGL"
+import glfw      "vendor:glfw"
+import microui   "vendor:microui"
+import miniaudio "vendor:miniaudio"
+import PM        "vendor:portmidi"
+import rl        "vendor:raylib"
+
 import SDL    "vendor:sdl2"
-import IMG    "vendor:sdl2/image"
 import SDLNet "vendor:sdl2/net"
+import IMG    "vendor:sdl2/image"
 import MIX    "vendor:sdl2/mixer"
 import TTF    "vendor:sdl2/ttf"
-import vk     "vendor:vulkan"
-import ENet   "vendor:ENet"
 
-_ :: glfw
+import stb_easy_font "vendor:stb/easy_font"
+import stbi          "vendor:stb/image"
+import stbrp         "vendor:stb/rect_pack"
+import stbtt         "vendor:stb/truetype"
+import stb_vorbis    "vendor:stb/vorbis"
+
+import vk "vendor:vulkan"
+
+
+_ :: botan
+_ :: ENet
 _ :: gl
-_ :: rl
+_ :: glfw
+_ :: microui
+_ :: miniaudio
 _ :: PM
+_ :: rl
 _ :: SDL
-_ :: IMG
 _ :: SDLNet
+_ :: IMG
 _ :: MIX
 _ :: TTF
-_ :: vk
-_ :: ENet
\ No newline at end of file
+_ :: stb_easy_font
+_ :: stbi
+_ :: stbrp
+_ :: stbtt
+_ :: stb_vorbis
+_ :: vk
\ No newline at end of file
diff --git a/examples/demo/demo.odin b/examples/demo/demo.odin
index 13dcf9466..a4b678ae7 100644
--- a/examples/demo/demo.odin
+++ b/examples/demo/demo.odin
@@ -1921,14 +1921,14 @@ constant_literal_expressions :: proc() {
 
 	fmt.println("-------")
 
-	Partial_Baz :: enum{A=5, B, C, D=16}
-	#assert(len(Partial_Baz) < len(#partial [Partial_Baz]int))
-	PARTIAL_ENUM_ARRAY_CONST :: #partial [Partial_Baz]int{.A ..= .C = 1, .D = 16}
-
-	fmt.println(PARTIAL_ENUM_ARRAY_CONST[.A])
-	fmt.println(PARTIAL_ENUM_ARRAY_CONST[.B])
-	fmt.println(PARTIAL_ENUM_ARRAY_CONST[.C])
-	fmt.println(PARTIAL_ENUM_ARRAY_CONST[.D])
+	Sparse_Baz :: enum{A=5, B, C, D=16}
+	#assert(len(Sparse_Baz) < len(#sparse[Sparse_Baz]int))
+	SPARSE_ENUM_ARRAY_CONST :: #sparse[Sparse_Baz]int{.A ..= .C = 1, .D = 16}
+
+	fmt.println(SPARSE_ENUM_ARRAY_CONST[.A])
+	fmt.println(SPARSE_ENUM_ARRAY_CONST[.B])
+	fmt.println(SPARSE_ENUM_ARRAY_CONST[.C])
+	fmt.println(SPARSE_ENUM_ARRAY_CONST[.D])
 
 	fmt.println("-------")