From a6555f786ed0b0d2f25186afd22dfb79fabca0a5 Mon Sep 17 00:00:00 2001 From: Lionel Sambuc Date: Wed, 27 Feb 2019 11:30:18 +0100 Subject: [PATCH] Resolve several warnings * Removed a couple of unused variables * Removed settings specifications whenever possible, to use default values * Set ALWAYS_SEARCH_USER_PATHS to NO, as it is now deprecated. * Applied the recommended settings for warnings, except for implicit casts to (u)int 32bit values. The reason is these come from the iterator implemented in the BBEdit official header. --- .../Rust.bblm/Contents/MacOS/Rust | Bin 33284 -> 33284 bytes Rust.xcodeproj/project.pbxproj | 61 ++++++++++++++++-- rust.mm | 5 +- 3 files changed, 56 insertions(+), 10 deletions(-) diff --git a/Contents/Language Modules/Rust.bblm/Contents/MacOS/Rust b/Contents/Language Modules/Rust.bblm/Contents/MacOS/Rust index 5eb97ace172379560e489fea7aa2a75c9dc1741a..4fd9d665f0e60a3eab90fec461065b7f658d1ab8 100755 GIT binary patch delta 2954 zcmb7GX>e256@FJ<@xqh5ilw%USJ}dnu)GM{5ZRJ*-ymZsJ26Qpu`y5&;02gMu!(HK zt}jK8JaMV;HH35AelOtKv~QZOc-VY7+jZv91}2`AvodnJn1P-+v$(qnS0(l z-#zzi_q=moON*kVMe&Sbnymx5!<~|C*4w@JuY4Au>k(JGOQN3*`MbF&OJv!Or;-l7?1ZiLR>Nw+$qUY=3~K(4ckIOw1?Or_xwAqkIA2y% z^8@~^W(4`8qo`}T!fx)OF1tlRd0UrbIDLI0fB2eXID>CVM6VsgYx$OIm_f&IVPjl> zH)-Oy>eg!wGx@_`Ii82{ElW_yBA!4?b$bRTVVbUE8swCVp2rV;DX$ep5q-3>d!B_a zq^$I>MxE5P60KkGTfZPMUJB&>@1;Oa+FFM`MK3wNWeUoAcMo}zn{d00-1V}zJ+a79 zr>&DZ*BAt6K6RC!v$8%!j)>FLf-@eoh)I6zOEP7R``5%sSx%R7I_}35V@kT}qJ{sJ zSu4BkY5zeKQC@@j&qqNeWrI|Ens$4r`AXdgYVNKNv}C=kX0~Q$`92u#!Pm7RYADu&HWeCo3E4w4GyR8Y`<#ks~Oeu37B@>!HpCN5mN#i}+WI z&4otGxCT3tFEMy(K^n)u4I^x>*NIdz=PY99fbu`95Ea_k39n1$?#3|c zis7iXTQcJ~mWUqlUN0Zf?g8T^tRKGg3%mIYU-E_ac>gglB$Sd2Xh`^&Jb>iHcD_d^ zdDvrTXKn11=PKMtoJgL)C`}`Ygm*Mr>^Glka>*azzGfbo0YZ{avHmW6qa9E3VRsTG zY3_STZxNCOE0eWkGyFc;NbbAOC)X0P5DHVZq!_AF`+@_~u}3X~^0dcfzPltnmJln< z&6uPJzYA>{CbAsPXOxCXLN?~<-yH_}lvJ3kT}OK1FIpWbfqrc^xdrOX_mCdRq}UKi zRwfw)UDkeb6ne5KI*_Kz4m*`1)k0tYr65!h3-!A7SVH2V)u26+a&pL@z?CzN z7~n?Ehl-7HC_WZ;o0Q}>95M-H`yxu|hVo|dFT zW}cC}1eJLI^bLZ(bhR1@ZZBk~^?9e+Bs+1Q(?+^aLc-Q^0NIw~pyg!PEGVk{^4%ei0f5sNey#HieKK>V+zcAdgfd81U j%Dlfs6xcB&h5q8ml6n8}&5?P3L9CYf4tLV>zeoKO*+JdQ delta 2986 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 HpV9vX=ZW;2 diff --git a/Rust.xcodeproj/project.pbxproj b/Rust.xcodeproj/project.pbxproj index de9d0d1..5a1a167 100644 --- a/Rust.xcodeproj/project.pbxproj +++ b/Rust.xcodeproj/project.pbxproj @@ -57,7 +57,7 @@ 089C1669FE841209C02AAC07 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 1010; }; buildConfigurationList = 2E4F91D10863164B009D6578 /* Build configuration list for PBXProject "Rust" */; compatibilityVersion = "Xcode 3.2"; @@ -91,14 +91,12 @@ 2E4F91CE0863164B009D6578 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; INFOPLIST_FILE = Info.plist; INSTALL_MODE_FLAG = "ug+w,o-w,a+rX"; - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = ""; PRODUCT_NAME = Rust; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; USER_HEADER_SEARCH_PATHS = "${HOME}/Projects/BBEdit/LanguageModuleSDK/Interfaces"; WRAPPER_EXTENSION = bblm; }; @@ -107,14 +105,12 @@ 2E4F91CF0863164B009D6578 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_ENABLE_OBJC_WEAK = YES; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = YES; INFOPLIST_FILE = Info.plist; INSTALL_MODE_FLAG = "ug+w,o-w,a+rX"; - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = ""; PRODUCT_NAME = Rust; - SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES; USER_HEADER_SEARCH_PATHS = "${HOME}/Projects/BBEdit/LanguageModuleSDK/Interfaces"; WRAPPER_EXTENSION = bblm; }; @@ -123,14 +119,65 @@ 2E4F91D20863164B009D6578 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_TREAT_WARNINGS_AS_ERRORS = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + ONLY_ACTIVE_ARCH = YES; }; name = Debug; }; 2E4F91D30863164B009D6578 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_NO_COMMON_BLOCKS = YES; GCC_TREAT_WARNINGS_AS_ERRORS = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; }; name = Release; }; diff --git a/rust.mm b/rust.mm index a67980d..e066aac 100644 --- a/rust.mm +++ b/rust.mm @@ -392,9 +392,9 @@ SInt32 scanForSymbol(BBLMTextIterator &iter, BBLMParamBlock ¶ms, const BBLMCallbackBlock *callbacks) { - SInt32 whitespaceLen, wordLen = 0, parametersLen = 0; + SInt32 whitespaceLen, wordLen = 0; UniChar ch; - int keywordLen = strlen(keyword); + size_t keywordLen = strlen(keyword); if (iter.strcmp(keyword, keywordLen) == 0) { @@ -409,7 +409,6 @@ SInt32 scanForSymbol(BBLMTextIterator &iter, return 0; } - SInt32 start_of_name = iter.Offset(); SInt32 start_of_function; while ((ch = iter.GetNextChar())) {