Skip to content
Permalink
Browse files

Merge pull request #1106 from alliedmodders/update-sp

Update SourcePawn to master.
  • Loading branch information
dvander committed Oct 29, 2019
2 parents c3102c7 + 7ab3a3c commit c0686dc4f904fc0a1337818386c6c6d213980935
Showing with 13 additions and 2 deletions.
  1. +11 −0 AMBuildScript
  2. +1 −1 public/amtl
  3. +1 −1 sourcepawn
@@ -379,6 +379,16 @@ class SMConfig(object):
def configure_windows(self, cxx):
cxx.defines += ['WIN32', '_WINDOWS']

def add_libamtl(self):
# Add libamtl.
self.libamtl = {}
for arch in self.archs:
def get_configure_fn(arch):
return lambda builder, name: self.StaticLibrary(builder, name, arch)
extra_vars = {'Configure': get_configure_fn(arch)}
libamtl = builder.Build('public/amtl/amtl/AMBuilder', extra_vars)
self.libamtl[arch] = libamtl.binary

def AddVersioning(self, binary, arch):
if builder.target.platform == 'windows':
binary.sources += ['version.rc']
@@ -613,6 +623,7 @@ SM = SMConfig()
SM.detectProductVersion()
SM.detectSDKs()
SM.configure()
SM.add_libamtl()

if SM.use_auto_versioning():
SM.generated_headers = builder.Build(
Submodule sourcepawn updated 97 files
+2 −2 .travis.yml
+31 −2 AMBuildScript
+5 −1 README.md
+13 −8 compiler/AMBuilder
+4 −0 compiler/assembler.cpp
+705 −0 compiler/code-generator.cpp
+18 −4 compiler/emitter.cpp
+4 −3 compiler/emitter.h
+33 −1 compiler/errors.cpp
+20 −3 compiler/errors.h
+327 −194 compiler/expressions.cpp
+46 −7 compiler/expressions.h
+12 −26 compiler/lexer.cpp
+40 −2 compiler/lexer.h
+7 −9 compiler/messages.h
+172 −0 compiler/name-resolution.cpp
+517 −0 compiler/new-parser.cpp
+58 −0 compiler/new-parser.h
+1 −1 compiler/optimizer.cpp
+0 −403 compiler/parse-expr.cpp
+0 −69 compiler/parse-expr.h
+701 −0 compiler/parse-node.h
+217 −348 compiler/parser.cpp
+105 −0 compiler/pool-allocator.cpp
+166 −0 compiler/pool-allocator.h
+12 −4 compiler/sc.h
+1 −1 compiler/sctracker.cpp
+2 −2 compiler/scvars.cpp
+1 −1 compiler/scvars.h
+1,674 −0 compiler/semantics.cpp
+0 −4 compiler/tests/sema/ok-implicit-int.sp
+0 −4 compiler/tests/sema/ok-implicit-void.sp
+5 −5 compiler/types.h
+3 −1 configure.py
+1 −0 exp/compiler/AMBuilder
+1 −0 exp/tools/docparse/AMBuilder
+1 −1 include/core/float.inc
+2 −0 tests/basic/array-assign.out
+13 −0 tests/basic/array-assign.sp
+3 −0 tests/basic/array-literal-expr.out
+11 −0 tests/basic/array-literal-expr.sp
+20 −0 tests/basic/assign-modify.out
+96 −0 tests/basic/assign-modify.sp
+36 −0 tests/basic/chained-compare.out
+75 −0 tests/basic/chained-compare.sp
+18 −0 tests/basic/default-args.out
+18 −0 tests/basic/default-args.sp
+0 −3 tests/basic/enum-storage-argument.out
+0 −27 tests/basic/enum-storage-argument.sp
+1 −0 tests/basic/float-math.out
+1 −0 tests/basic/float-math.sp
+16 −0 tests/basic/logical.out
+28 −0 tests/basic/logical.sp
+2 −0 tests/basic/lvalue-in-comma.out
+11 −0 tests/basic/lvalue-in-comma.sp
+6 −0 tests/basic/methodmap-accessor.out
+28 −0 tests/basic/methodmap-accessor.sp
+1 −0 tests/basic/methodmap-ctor.out
+16 −0 tests/basic/methodmap-ctor.sp
+1 −0 tests/basic/methodmap-static.out
+12 −0 tests/basic/methodmap-static.sp
+3 −0 tests/basic/named-args.out
+11 −0 tests/basic/named-args.sp
+1 −0 tests/basic/new-operator.out
+24 −0 tests/basic/new-operator.sp
+4 −0 tests/basic/ternary.out
+12 −0 tests/basic/ternary.sp
+16 −0 tests/basic/userop-incdec.out
+58 −0 tests/basic/userop-incdec.sp
+1 −0 tests/basic/varargs-5.out
+6 −0 tests/basic/varargs-5.sp
+0 −27 tests/basic/view-as-to-array.sp
+10 −0 tests/compile-only/fail-array-char-to-int-ref.sp
+1 −0 tests/compile-only/fail-array-char-to-int-ref.txt
+9 −0 tests/compile-only/fail-array-index-wrong-type.sp
+2 −0 tests/compile-only/fail-array-index-wrong-type.txt
+6 −0 tests/compile-only/fail-array-size-wrong-type.sp
+2 −0 tests/compile-only/fail-array-size-wrong-type.txt
+1 −1 tests/compile-only/fail-broken-if-conditional.txt
+0 −1 tests/compile-only/fail-comma-expr-lvalue.txt
+1 −3 tests/compile-only/fail-enum-struct-field-not-found.sp
+1 −1 tests/compile-only/fail-enum-struct-field-not-found.txt
+0 −2 tests/compile-only/fail-enum-struct-in-old-syntax.sp
+1 −1 tests/compile-only/fail-enum-struct-in-old-syntax.txt
+12 −0 tests/compile-only/fail-legacy-enum-struct.sp
+1 −0 tests/compile-only/fail-legacy-enum-struct.txt
+0 −12 tests/compile-only/fail-legacy-enum-structs.sp
+0 −3 tests/compile-only/fail-legacy-enum-structs.txt
+2 −0 tests/compile-only/fail-method-on-function.sp
+1 −1 tests/compile-only/fail-method-on-function.txt
+0 −11 tests/compile-only/fail-sizeof-enum-struct.sp
+0 −12 tests/compile-only/ok-array-size-untagged-enum.sp
+61 −8 tests/runtests.py
+124 −124 tests/sourcemod/adminmenu/dynamicmenu.sp
+3 −2 tests/testutil.py
+1 −1 third_party/amtl
+3 −0 vm/AMBuilder

0 comments on commit c0686dc

Please sign in to comment.
You can’t perform that action at this time.