Skip to content

Commit

Permalink
Preparation for update to master (#218)
Browse files Browse the repository at this point in the history
* Updated output whitespace for consistency.

* Minor version bump.
The next release is likely to be 0.6.0.
Added Prolog and VHDL CCR grammars.
Mostly internal overhaul of Atom support.
Improved unicode support.
  • Loading branch information
Versatilus authored Mar 29, 2018
1 parent 4b1a773 commit 790f046
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
6 changes: 6 additions & 0 deletions .style.yapf
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[style]
based_on_style=pep8
column_limit=90
indent_dictionary_value=True
split_complex_comprehension=True
no_spaces_around_selected_binary_operators=*,/
7 changes: 3 additions & 4 deletions caster/lib/ccr/javascript/javascript.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@
@author: synkarius
'''
from dragonfly import Key, Text

from caster.lib import control
from caster.lib.ccr.standard import SymbolSpecs
from caster.lib.dfplus.additions import SelectiveAction
from caster.lib.dfplus.merge.mergerule import MergeRule
from caster.lib.dfplus.state.short import R
from dragonfly import Key, Text


class Javascript(MergeRule):
Expand Down Expand Up @@ -80,8 +79,8 @@ class Javascript(MergeRule):
"instance of": R(Text("instanceof "), rdescript="Javascript: Instance Of"),

"var": R(Text("var "), rdescript="Javascript: Var"),
"const": R(Text("const"), rdescript=" JavaScript: Const"),
"Let": R(Text("let"), rdescript=" JavaScript: Let"),
"const": R(Text("const "), rdescript=" JavaScript: Const"),
"Let": R(Text("let "), rdescript=" JavaScript: Let"),

"shell iffae": R(Text("else if ()") + Key("left"), rdescript="Javascript: Else If"),

Expand Down
2 changes: 1 addition & 1 deletion caster/lib/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
BASE_PATH = os.path.realpath(__file__).split("\\lib")[0].replace("\\", "/")

# title
SOFTWARE_VERSION_NUMBER = "0.5.9"
SOFTWARE_VERSION_NUMBER = "0.5.10"
SOFTWARE_NAME = "Caster v " + SOFTWARE_VERSION_NUMBER
HOMUNCULUS_VERSION = "HMC v " + SOFTWARE_VERSION_NUMBER
HMC_TITLE_RECORDING = " :: Recording Manager"
Expand Down

0 comments on commit 790f046

Please sign in to comment.