update olua to v1.4

build.lua

@@ -1,7 +1,7 @@
-OLUA_AUTO_EXPORT_PARENT = true
-
 require "olua"
 
+olua.AUTO_EXPORT_PARENT = true
+
 -------------------------------------------------------------------------------
 --- clang compile options
 -------------------------------------------------------------------------------

src/clang_wrapper.cpp

@@ -189,23 +189,6 @@ std::shared_ptr<Cursor> TranslationUnit::cursor()
     return _cursor->shared_from_this();
 }
 
-bool TranslationUnit::isFileMultipleIncludeGuarded(File *f)
-{
-    return clang_isFileMultipleIncludeGuarded(_value, f->_value);
-}
-
-std::shared_ptr<File> TranslationUnit::getFile(const std::string &path)
-{
-    return makeFile(clang_getFile(_value, path.c_str()));
-}
-
-string TranslationUnit::getFileContents(File *f)
-{
-    size_t len;
-    const char *data = clang_getFileContents(_value, f->_value, &len);
-    return string(data, len);
-}
-
 std::vector<std::shared_ptr<Diagnostic>> TranslationUnit::diagnostics()
 {
     std::vector<std::shared_ptr<Diagnostic>> arr;

src/clang_wrapper.h

@@ -148,7 +148,7 @@ class File : public IndexError, public std::enable_shared_from_this<File>
     }
 
     /** @oluasee clang_File_tryGetRealPathName */
-    string tryGetRealPathName() {
+    OLUA_GETTER string realPathName() {
         return clang_File_tryGetRealPathName(_value);
     }
 private:
@@ -267,6 +267,11 @@ class Type : public IndexError, public std::enable_shared_from_this<Type>
         return arr;
     }
 
+    /** @oluasee clang_getNumArgTypes */
+    OLUA_GETTER int numArgTypes() {
+        return clang_getNumArgTypes(_value);
+    }
+
     /** @oluasee clang_getArgType */
     std::shared_ptr<Type> getArgType(unsigned int i) {
         return makeType(clang_getArgType(_value, i));
@@ -337,7 +342,7 @@ class Type : public IndexError, public std::enable_shared_from_this<Type>
         return makeType(clang_Type_getValueType(_value));
     }
     /** @oluasee clang_Type_getOffsetOf */
-    long long offsetOf(const char *field) {
+    long long getOffsetOf(const char *field) {
         return clang_Type_getOffsetOf(_value, field);
     }
 
@@ -351,6 +356,12 @@ class Type : public IndexError, public std::enable_shared_from_this<Type>
         return arr;
     }
 
+    /** @oluasee clang_Type_getNumTemplateArguments */
+    OLUA_GETTER int numTemplateArguments() {
+        return clang_Type_getNumTemplateArguments(_value);
+    }
+
+    /** @oluasee clang_Type_getTemplateArgumentAsType */
     std::shared_ptr<Type> getTemplateArgument(unsigned int i) {
         return makeType(clang_Type_getTemplateArgumentAsType(_value, i));
     }
@@ -423,7 +434,7 @@ class Cursor : public IndexError, public std::enable_shared_from_this<Cursor>
     }
 
     /** @oluasee clang_hashCursor */
-    unsigned hashCursor() {
+    OLUA_GETTER unsigned hash() {
         return clang_hashCursor(_value);
     }
 
@@ -569,7 +580,7 @@ class Cursor : public IndexError, public std::enable_shared_from_this<Cursor>
     }
 
     /** @oluasee clang_getTypedefDeclUnderlyingType */
-    OLUA_GETTER std::shared_ptr<Type> underlyingType() {
+    OLUA_GETTER std::shared_ptr<Type> typedefDeclUnderlyingType() {
         return makeType(clang_getTypedefDeclUnderlyingType(_value));
     }
 
@@ -614,17 +625,17 @@ class Cursor : public IndexError, public std::enable_shared_from_this<Cursor>
     }
 
     /** @oluasee clang_Cursor_getTemplateArgumentValue */
-    TemplateArgumentKind templateArgumentKind(unsigned index) {
+    TemplateArgumentKind getTemplateArgumentKind(unsigned index) {
         return clang_Cursor_getTemplateArgumentKind(_value, index);
     }
 
     /** @oluasee clang_Cursor_getTemplateArgumentValue */
-    long long templateArgumentValue(unsigned index) {
+    long long getTemplateArgumentValue(unsigned index) {
         return clang_Cursor_getTemplateArgumentValue(_value, index);
     }
 
     /** @oluasee clang_Cursor_getTemplateArgumentUnsignedValue */
-    unsigned long long templateArgumentUnsignedValue(unsigned index) {
+    unsigned long long getTemplateArgumentUnsignedValue(unsigned index) {
         return clang_Cursor_getTemplateArgumentUnsignedValue(_value, index);
     }
 
@@ -722,11 +733,6 @@ class Cursor : public IndexError, public std::enable_shared_from_this<Cursor>
         }
         return arr;
     }
-
-    /** @oluasee clang_getIBOutletCollectionType */
-    OLUA_GETTER std::shared_ptr<Type> ibOutletCollectionType() {
-        return makeType(clang_getIBOutletCollectionType(_value));
-    }
 
     /** @oluasee clang_visitChildren */
     OLUA_GETTER std::vector<std::shared_ptr<Cursor>> children() {
@@ -736,7 +742,7 @@ class Cursor : public IndexError, public std::enable_shared_from_this<Cursor>
     }
 
     /** @oluasee clang_Cursor_getSpellingNameRange */
-    SourceRange nameRange(unsigned pieceIndex, unsigned options) {
+    SourceRange getNameRange(unsigned pieceIndex, unsigned options) {
         CXSourceRange range = clang_Cursor_getSpellingNameRange(_value, pieceIndex, options);
         return getRange(range);
     }
@@ -819,7 +825,7 @@ class Cursor : public IndexError, public std::enable_shared_from_this<Cursor>
     }
 
     /** @oluasee clang_Cursor_getModule */
-    std::shared_ptr<Module> getModule() {
+    OLUA_GETTER std::shared_ptr<Module> getModule() {
         return makeModule(clang_Cursor_getModule(_value));
     }
 
@@ -844,52 +850,52 @@ class Cursor : public IndexError, public std::enable_shared_from_this<Cursor>
     }
 
     /** @oluasee clang_CXXField_isMutable */
-    OLUA_GETTER bool isCXXFieldMutable() {
+    OLUA_GETTER bool isCXXMutableField() {
         return clang_CXXField_isMutable(_value);
     }
 
     /** @oluasee clang_CXXMethod_isDefaulted */
-    OLUA_GETTER bool isCXXMethodDefaulted() {
+    OLUA_GETTER bool isCXXDefaultedMethod() {
         return clang_CXXMethod_isDefaulted(_value);
     }
 
     /** @oluasee clang_CXXMethod_isDeleted */
-    OLUA_GETTER bool isCXXMethodDeleted() {
+    OLUA_GETTER bool isCXXDeletedMethod() {
         return clang_CXXMethod_isDeleted(_value);
     }
 
     /** @oluasee clang_CXXMethod_isPureVirtual */
-    OLUA_GETTER bool isCXXMethodPureVirtual() {
+    OLUA_GETTER bool isCXXPureVirtualMethod() {
         return clang_CXXMethod_isPureVirtual(_value);
     }
 
     /** @oluasee clang_CXXMethod_isStatic */
-    OLUA_GETTER bool isCXXMethodStatic() {
+    OLUA_GETTER bool isCXXStaticMethod() {
         return clang_CXXMethod_isStatic(_value);
     }
 
     /** @oluasee clang_CXXMethod_isVirtual */
-    OLUA_GETTER bool isCXXMethodVirtual() {
+    OLUA_GETTER bool isCXXVirtualMethod() {
         return clang_CXXMethod_isVirtual(_value);
     }
 
     /** @oluasee clang_CXXMethod_isCopyAssignmentOperator */
-    OLUA_GETTER bool isCXXMethodCopyAssignmentOperator() {
+    OLUA_GETTER bool isCXXCopyAssignmentOperator() {
         return clang_CXXMethod_isCopyAssignmentOperator(_value);
     }
 
     /** @oluasee clang_CXXMethod_isMoveAssignmentOperator */
-    OLUA_GETTER bool isCXXMethodMoveAssignmentOperator() {
+    OLUA_GETTER bool isCXXMoveAssignmentOperator() {
         return clang_CXXMethod_isMoveAssignmentOperator(_value);
     }
 
     /** @oluasee clang_CXXMethod_isConst */
-    OLUA_GETTER bool isCXXMethodConst() {
+    OLUA_GETTER bool isCXXConstMethod() {
         return clang_CXXMethod_isConst(_value);
     }
 
     /** @oluasee clang_CXXMethod_isExplicit */
-    OLUA_GETTER bool isCXXMethodExplicit() {
+    OLUA_GETTER bool isCXXExplicitMethod() {
         return clang_CXXMethod_isExplicit(_value);
     }
 
@@ -899,7 +905,7 @@ class Cursor : public IndexError, public std::enable_shared_from_this<Cursor>
     }
 
     /** @oluasee clang_EnumDecl_isScoped */
-    OLUA_GETTER bool isEnumDeclScoped() {
+    OLUA_GETTER bool isScopedEnumDecl() {
         return clang_EnumDecl_isScoped(_value);
     }
 
@@ -919,7 +925,7 @@ class Cursor : public IndexError, public std::enable_shared_from_this<Cursor>
     }
 
     /** @oluasee clang_getCursorReferenceNameRange */
-    SourceRange referenceNameRange(unsigned pieceIndex, unsigned options) {
+    SourceRange getReferenceNameRange(unsigned pieceIndex, unsigned options) {
         CXSourceRange range = clang_getCursorReferenceNameRange(_value, pieceIndex, options);
         return getRange(range);
     }
@@ -965,18 +971,34 @@ class TranslationUnit : public IndexError, public std::enable_shared_from_this<T
     OLUA_GETTER string name();
     OLUA_GETTER std::shared_ptr<Cursor> cursor();
 
-    bool isFileMultipleIncludeGuarded(File *f);
-    std::shared_ptr<File> getFile(const std::string &path);
-    string getFileContents(File *f);
+    /** @oluasee clang_isFileMultipleIncludeGuarded */
+    bool isFileMultipleIncludeGuarded(File *f) {
+        return clang_isFileMultipleIncludeGuarded(_value, f->_value);
+    }
+
+    /** @oluasee clang_getFile */
+    std::shared_ptr<File> getFile(const std::string &path)
+    {
+        return makeFile(clang_getFile(_value, path.c_str()));
+    }
+
+    /** @oluasee clang_getFileContents */
+    string getFileContents(File *f)
+    {
+        size_t len;
+        const char *data = clang_getFileContents(_value, f->_value, &len);
+        return string(data, len);
+    }
+
     OLUA_GETTER std::vector<std::shared_ptr<Diagnostic>> diagnostics();
     OLUA_GETTER std::set<std::shared_ptr<Diagnostic>> diagnosticSetFromTU();
     std::shared_ptr<Module> moduleForFile(const std::shared_ptr<File> &file);
     unsigned numTopLevelHeaders(const std::shared_ptr<Module> &m);
     std::shared_ptr<File> topLevelHeader(const std::shared_ptr<Module> &m, unsigned index);
-    unsigned defaultSaveOptions();
+    OLUA_GETTER unsigned defaultSaveOptions();
     int saveTranslationUnit(const std::string &path, unsigned options);
-    unsigned suspendTranslationUnit();
-    unsigned defaultReparseOptions();
+    OLUA_GETTER unsigned suspendTranslationUnit();
+    OLUA_GETTER unsigned defaultReparseOptions();
 private:
     CXTranslationUnit _value;
     std::shared_ptr<Cursor> _cursor;