openstack/yaql
Code Issues Proposed changes

migrated cli functions

Browse Source
This commit is contained in:
ativelkov 2014-01-24 17:26:26 -08:00
parent c16eb235f7
commit da36075653
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
yaql/cli/cli_functions.py
View File

@ -18,20 +18,19 @@ import re
import types
from json import JSONDecoder
from yaql.context import Context
from yaql.exceptions import YaqlParsingException
from yaql.language.context import Context
from yaql.language.exceptions import YaqlParsingException
import yaql
from yaql.functions.old.decorators import arg, ContextAware
from yaql.language import lexer
from yaql.language.engine import context_aware
from yaql.language.utils import limit
PROMPT = "yaql> "
@ContextAware()
@arg('show_tokens')
@context_aware
def main(context, show_tokens):
print "Yet Another Query Language - command-line query tool"
print "Copyright (c) 2013 Mirantis, Inc"
@ -49,18 +48,18 @@ def main(context, show_tokens):
if not comm:
continue
if comm[0] == '@':
funcName, args = parse_service_command(comm)
if funcName not in SERVICE_FUNCTIONS:
print "Unknown command " + funcName
func_name, args = parse_service_command(comm)
if func_name not in SERVICE_FUNCTIONS:
print "Unknown command " + func_name
else:
SERVICE_FUNCTIONS[funcName](args, context)
SERVICE_FUNCTIONS[func_name](args, context)
continue
try:
if show_tokens:
lexer.input(comm)
lexer.lexer.input(comm)
tokens = []
while True:
tok = lexer.token()
tok = lexer.lexer.token()
if not tok:
break
tokens.append(tok)