Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move language to third argument to evaluateExpressionValue #210

Merged
merged 1 commit into from
Nov 14, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions commands/FBXCTestCommands.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def run(self, arguments, options):
element = "XCUIApplication()" if language == lldb.eLanguageTypeSwift else "(XCUIApplication *)[[XCUIApplication alloc] init]"

# Evaluate object
element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language)
element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language=language)
""":type: lldb.SBValue"""

# Get pointer value, so it will be working in Swift and Objective-C
Expand All @@ -84,7 +84,7 @@ def run(self, arguments, options):
snapshot = take_snapshot(element_pointer)

# Print tree for snapshot element
snapshot_object = XCElementSnapshot(snapshot, language)
snapshot_object = XCElementSnapshot(snapshot, language=language)
print snapshot_object.tree().hierarchy_text(pointer=options.pointer, trait=options.trait, frame=options.frame)


Expand All @@ -105,7 +105,7 @@ def run(self, arguments, options):
element = "XCUIApplication()" if language == lldb.eLanguageTypeSwift else "(XCUIApplication *)[[XCUIApplication alloc] init]"

# Evaluate object
element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language)
element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language=language)
""":type: lldb.SBValue"""

# Get pointer value, so it will be working in Swift and Objective-C
Expand All @@ -115,7 +115,7 @@ def run(self, arguments, options):
snapshot = take_snapshot(element_pointer)

# Print details of snapshot element
snapshot_object = XCElementSnapshot(snapshot, language)
snapshot_object = XCElementSnapshot(snapshot, language=language)
print snapshot_object.detail_summary()


Expand Down Expand Up @@ -144,7 +144,7 @@ def run(self, arguments, options):
element = "XCUIApplication()" if language == lldb.eLanguageTypeSwift else "(XCUIApplication *)[[XCUIApplication alloc] init]"

# Evaluate object
element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language)
element_sbvalue = fb.evaluateExpressionValue("{}".format(element), language=language)
""":type: lldb.SBValue"""

# Get pointer value, so it will be working in Swift and Objective-C
Expand All @@ -154,7 +154,7 @@ def run(self, arguments, options):
snapshot = take_snapshot(element_pointer)

# Print tree for snapshot element
snapshot_object = XCElementSnapshot(snapshot, language)
snapshot_object = XCElementSnapshot(snapshot, language=language)
elements = snapshot_object.find_missing_identifiers(status_bar=options.status_bar)
if elements is not None:
print elements.hierarchy_text(pointer=options.pointer, trait=options.trait, frame=options.frame)
Expand Down
2 changes: 1 addition & 1 deletion fblldbbase.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def run(self, arguments, option):

# evaluates expression in Objective-C++ context, so it will work even for
# Swift projects
def evaluateExpressionValue(expression, language=lldb.eLanguageTypeObjC_plus_plus, printErrors=True):
def evaluateExpressionValue(expression, printErrors=True, language=lldb.eLanguageTypeObjC_plus_plus):
frame = lldb.debugger.GetSelectedTarget().GetProcess().GetSelectedThread().GetSelectedFrame()
options = lldb.SBExpressionOptions()
options.SetLanguage(language)
Expand Down