expressir 0.2.26-x86_64-darwin → 1.2.0-x86_64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: feb7495c9694a4fecc786932f30260714e92fc565baf6411ab39500dca0de9d0
-  data.tar.gz: 5b634a6a492f0559112d6da5a49fb9ec06562e5ef742ffc99e1d069f42f9df5f
+  metadata.gz: c22fd11d6952d738289537aaeba0b3e6eed0c67e9bc8b2d89a2aa6ee18cf0678
+  data.tar.gz: efd45ad880298c145bc01007a9767b7573adf982e5acebb1c69612b31eda9692
 SHA512:
-  metadata.gz: ea59f9a0454c75c83271f3c40ecaeb7a0d9b5e23df88e4922e584a8e6d23f352ad330f6ecdeffe03c2e943bdb687ae3a38109d8b637640e9c89933ebe71b5fc0
-  data.tar.gz: c3a7168b7caf2bd6ef5831978305323192bc8810ab1735fbf67747bc210ded70521771c864815f832661c82ded594a8d1a127c6c38b9f0a59baf29e831d6fb8f
+  metadata.gz: 6530f1cae01d755b4f455b06cf289ebbbed7d0cf69f93238c32ca3affc0e7a0249d226dd9e86e74e22577e8c3150180a6f5d97b15c2c66dc5d48bc92edfd338b
+  data.tar.gz: 5b8bf3398ece079c0ee0a6972bc4c41aa455d821c7fc42b4746bcc1070fa5802037bfc5d2303f7d5366f28488e6f9ace1d432279765ac4898a7e56d72264038b

data/.github/workflows/rake.yml

@@ -2,7 +2,7 @@ name: rake
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, main ]
   pull_request:
 
 jobs:
@@ -13,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        ruby: [ '2.7', '2.6', '2.5' ]
         os: [ ubuntu-latest, windows-latest, macos-latest ]
         experimental: [ false ]
         include:
@@ -42,10 +42,55 @@ jobs:
 
       - uses: actions/cache@v2
         with:
-          path: lib/expressir/express_exp/express_parser.*
-          key: v3-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
+          path: lib/expressir/express/express_parser.*
+          key: v4-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles('ext/express-parser/extconf.rb', 'ext/express-parser/antlrgen/**', 'ext/express-parser/express_parser.cpp', '.git/modules/ext/express-parser/antlr4-upstream/HEAD') }}
 
-      - if: hashFiles('lib/expressir/express_exp/express_parser.*') == ''
+      - if: hashFiles('lib/expressir/express/express_parser.*') == ''
         run: bundle exec rake compile
 
       - run: bundle exec rake
+
+  # test release workflow
+  pack:
+    runs-on: ubuntu-18.04
+    strategy:
+      fail-fast: false
+      matrix:
+        host: [ linux, windows, darwin ]
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.6'
+          # bundler-cache: true important to not use cache because it leads to "cannot find -lrice"
+          # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
+
+      - run: bundle install --jobs 4 --retry 3
+
+      # build gem WITHOUT pre-built native extension
+      - run: gem build expressir.gemspec
+
+      - if: matrix.host == 'linux'
+        uses: actions/upload-artifact@v2
+        with:
+          name: pkg-ruby
+          path: expressir-*.gem
+
+      - name: Enable swap
+        run: |
+          sudo fallocate -l 15g /compile.swap
+          sudo chmod 600 /compile.swap
+          sudo mkswap /compile.swap
+          sudo swapon /compile.swap
+          sudo swapon --all --verbose
+
+      # build gem WITH pre-built native extension
+      - run: bundle exec rake gem:${{ matrix.host }}
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: pkg-${{ matrix.host }}
+          path: pkg/*.gem

data/.github/workflows/release.yml

@@ -59,6 +59,14 @@ jobs:
           name: pkg-ruby
           path: expressir-*.gem
 
+      - name: Enable swap
+        run: |
+          sudo fallocate -l 15g /compile.swap
+          sudo chmod 600 /compile.swap
+          sudo mkswap /compile.swap
+          sudo swapon /compile.swap
+          sudo swapon --all --verbose
+
       # build gem WITH pre-built native extension
       - run: bundle exec rake gem:${{ matrix.host }}
 

data/.gitignore

@@ -8,8 +8,8 @@
 /tmp/
 /Gemfile.lock
 /.idea
-/lib/expressir/express_exp/express_parser.bundle
-/original/examples/syntax/*-pretty.exp
+/lib/expressir/express/express_parser.bundle
+/spec/syntax/*-pretty.exp
 
 # rspec failure tracking
 .rspec_status

data/.hound.yml

@@ -0,0 +1,3 @@
+ruby:
+  enabled: true
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -1,508 +1,8 @@
----
+inherit_from:
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
+
+# local repo-specific modifications
+# ...
+
 AllCops:
-  Exclude:
-  - vendor/**/*
-  - db/**/*
-  - tmp/**/*
-  DisplayCopNames: false
-  StyleGuideCopsOnly: false
   TargetRubyVersion: 2.4
-Naming/AccessorMethodName:
-  Description: Check the naming of accessor methods for get_/set_.
-  Enabled: false
-Style/Alias:
-  Description: Use alias_method instead of alias.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#alias-method
-  Enabled: false
-Style/ArrayJoin:
-  Description: Use Array#join instead of Array#*.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#array-join
-  Enabled: false
-Style/AsciiComments:
-  Description: Use only ascii symbols in comments.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#english-comments
-  Enabled: false
-Naming/AsciiIdentifiers:
-  Description: Use only ascii symbols in identifiers.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#english-identifiers
-  Enabled: false
-Style/Attr:
-  Description: Checks for uses of Module#attr.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#attr
-  Enabled: false
-Metrics/BlockNesting:
-  Description: Avoid excessive block nesting
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#three-is-the-number-thou-shalt-count
-  Enabled: true
-  Max: 3
-Style/CaseEquality:
-  Description: Avoid explicit use of the case equality operator(===).
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-case-equality
-  Enabled: false
-Style/CharacterLiteral:
-  Description: Checks for uses of character literals.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-character-literals
-  Enabled: false
-Style/ClassAndModuleChildren:
-  Description: Checks style of children classes and modules.
-  Enabled: true
-  EnforcedStyle: nested
-Metrics/ClassLength:
-  Description: Avoid classes longer than 100 lines of code.
-  Enabled: false
-  CountComments: false
-  Max: 100
-Metrics/ModuleLength:
-  Description: Avoid modules longer than 100 lines of code.
-  Enabled: false
-Style/ClassVars:
-  Description: Avoid the use of class variables.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-class-vars
-  Enabled: false
-Style/CollectionMethods:
-  Enabled: true
-  PreferredMethods:
-    find: detect
-    inject: reduce
-    collect: map
-    find_all: select
-Style/ColonMethodCall:
-  Description: 'Do not use :: for method call.'
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#double-colons
-  Enabled: false
-Style/CommentAnnotation:
-  Description: Checks formatting of special comments (TODO, FIXME, OPTIMIZE, HACK,
-    REVIEW).
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#annotate-keywords
-  Enabled: false
-Metrics/AbcSize:
-  Description: A calculated magnitude based on number of assignments, branches, and
-    conditions.
-  Enabled: true
-  Max: 15
-Metrics/BlockLength:
-  CountComments: true
-  Max: 25
-  ExcludedMethods: []
-  Exclude:
-  - spec/**/*
-Metrics/CyclomaticComplexity:
-  Description: A complexity metric that is strongly correlated to the number of test
-    cases needed to validate a method.
-  Enabled: true
-  Max: 6
-Rails/Delegate:
-  Description: Prefer delegate method for delegations.
-  Enabled: false
-Style/PreferredHashMethods:
-  Description: Checks use of `has_key?` and `has_value?` Hash methods.
-  StyleGuide: "#hash-key"
-  Enabled: false
-Style/Documentation:
-  Description: Document classes and non-namespace modules.
-  Enabled: false
-Style/DoubleNegation:
-  Description: Checks for uses of double negation (!!).
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-bang-bang
-  Enabled: false
-Style/EachWithObject:
-  Description: Prefer `each_with_object` over `inject` or `reduce`.
-  Enabled: false
-Style/EmptyLiteral:
-  Description: Prefer literals to Array.new/Hash.new/String.new.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#literal-array-hash
-  Enabled: false
-Style/Encoding:
-  Enabled: false
-Style/EvenOdd:
-  Description: Favor the use of Fixnum#even? && Fixnum#odd?
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#predicate-methods
-  Enabled: false
-Naming/FileName:
-  Description: Use snake_case for source file names.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Description: Add the frozen_string_literal comment to the top of files to help transition
-    from Ruby 2.3.0 to Ruby 3.0.
-  Enabled: false
-Style/FlipFlop:
-  Description: Checks for flip flops
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-flip-flops
-  Enabled: false
-Style/FormatString:
-  Description: Enforce the use of Kernel#sprintf, Kernel#format or String#%.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#sprintf
-  Enabled: false
-Style/GlobalVars:
-  Description: Do not introduce global variables.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#instance-vars
-  Reference: http://www.zenspider.com/Languages/Ruby/QuickRef.html
-  Enabled: false
-Style/GuardClause:
-  Description: Check for conditionals that can be replaced with guard clauses
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals
-  Enabled: false
-Style/IfUnlessModifier:
-  Description: Favor modifier if/unless usage when you have a single-line body.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
-  Enabled: false
-Style/IfWithSemicolon:
-  Description: Do not use if x; .... Use the ternary operator instead.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-semicolon-ifs
-  Enabled: false
-Style/InlineComment:
-  Description: Avoid inline comments.
-  Enabled: false
-Style/Lambda:
-  Description: Use the new lambda literal syntax for single-line blocks.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#lambda-multi-line
-  Enabled: false
-Style/LambdaCall:
-  Description: Use lambda.call(...) instead of lambda.(...).
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#proc-call
-  Enabled: false
-Style/LineEndConcatenation:
-  Description: Use \ instead of + or << to concatenate two string literals at line
-    end.
-  Enabled: false
-Metrics/LineLength:
-  Description: Limit lines to 80 characters.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#80-character-limits
-  Max: 80
-  Enabled: true
-  AllowURI: true
-  URISchemes:
-  - http
-  - https
-Metrics/MethodLength:
-  Description: Avoid methods longer than 10 lines of code.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#short-methods
-  Enabled: true
-  CountComments: true
-  Max: 10
-  Exclude:
-  - spec/**/*
-Style/ModuleFunction:
-  Description: Checks for usage of `extend self` in modules.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#module-function
-  Enabled: false
-Style/MultilineBlockChain:
-  Description: Avoid multi-line chains of blocks.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#single-line-blocks
-  Enabled: false
-Style/NegatedIf:
-  Description: Favor unless over if for negative conditions (or control flow or).
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#unless-for-negatives
-  Enabled: false
-Style/NegatedWhile:
-  Description: Favor until over while for negative conditions.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#until-for-negatives
-  Enabled: false
-Style/Next:
-  Description: Use `next` to skip iteration instead of a condition at the end.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals
-  Enabled: false
-Style/NilComparison:
-  Description: Prefer x.nil? to x == nil.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#predicate-methods
-  Enabled: false
-Style/Not:
-  Description: Use ! instead of not.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#bang-not-not
-  Enabled: false
-Style/NumericLiterals:
-  Description: Add underscores to large numeric literals to improve their readability.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#underscores-in-numerics
-  Enabled: false
-Style/OneLineConditional:
-  Description: Favor the ternary operator(?:) over if/then/else/end constructs.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#ternary-operator
-  Enabled: false
-Naming/BinaryOperatorParameterName:
-  Description: When defining binary operators, name the argument other.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#other-arg
-  Enabled: false
-Metrics/ParameterLists:
-  Description: Avoid long parameter lists.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#too-many-params
-  Enabled: true
-  Max: 5
-  CountKeywordArgs: true
-Style/PercentLiteralDelimiters:
-  Description: Use `%`-literal delimiters consistently
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-literal-braces
-  Enabled: false
-Style/PerlBackrefs:
-  Description: Avoid Perl-style regex back references.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers
-  Enabled: false
-Naming/PredicateName:
-  Description: Check the names of predicate methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark
-  NamePrefixBlacklist:
-  - is_
-  Exclude:
-  - spec/**/*
-Style/Proc:
-  Description: Use proc instead of Proc.new.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#proc
-  Enabled: false
-Style/RaiseArgs:
-  Description: Checks the arguments passed to raise/fail.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#exception-class-messages
-  Enabled: false
-Style/RegexpLiteral:
-  Description: Use / or %r around regular expressions.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-r
-  Enabled: false
-Style/SelfAssignment:
-  Description: Checks for places where self-assignment shorthand should have been
-    used.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#self-assignment
-  Enabled: false
-Style/SingleLineBlockParams:
-  Description: Enforces the names of some block params.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#reduce-blocks
-  Enabled: false
-Style/SingleLineMethods:
-  Description: Avoid single-line methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-single-line-methods
-  Enabled: false
-Style/SignalException:
-  Description: Checks for proper usage of fail and raise.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#fail-method
-  Enabled: false
-Style/SpecialGlobalVars:
-  Description: Avoid Perl-style global variables.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-cryptic-perlisms
-  Enabled: false
-Style/StringLiterals:
-  Description: Checks if uses of quotes match the configured preference.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-string-literals
-  EnforcedStyle: double_quotes
-  Enabled: true
-Style/TrailingCommaInArguments:
-  Description: Checks for trailing comma in argument lists.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas
-  EnforcedStyleForMultiline: comma
-  SupportedStylesForMultiline:
-  - comma
-  - consistent_comma
-  - no_comma
-  Enabled: true
-Style/TrailingCommaInArrayLiteral:
-  Description: Checks for trailing comma in array literals.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas
-  EnforcedStyleForMultiline: comma
-  SupportedStylesForMultiline:
-  - comma
-  - consistent_comma
-  - no_comma
-  Enabled: true
-Style/TrailingCommaInHashLiteral:
-  Description: Checks for trailing comma in hash literals.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas
-  EnforcedStyleForMultiline: comma
-  SupportedStylesForMultiline:
-  - comma
-  - consistent_comma
-  - no_comma
-  Enabled: true
-Style/TrivialAccessors:
-  Description: Prefer attr_* methods to trivial readers/writers.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#attr_family
-  Enabled: false
-Style/VariableInterpolation:
-  Description: Don't interpolate global, instance and class variables directly in
-    strings.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#curlies-interpolate
-  Enabled: false
-Style/WhenThen:
-  Description: Use when x then ... for one-line cases.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#one-line-cases
-  Enabled: false
-Style/WhileUntilModifier:
-  Description: Favor modifier while/until usage when you have a single-line body.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#while-as-a-modifier
-  Enabled: false
-Style/WordArray:
-  Description: Use %w or %W for arrays of words.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-w
-  Enabled: false
-Layout/AlignParameters:
-  Description: Here we check if the parameters on a multi-line method call or definition
-    are aligned.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-double-indent
-  Enabled: false
-Layout/ConditionPosition:
-  Description: Checks for condition placed in a confusing position relative to the
-    keyword.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#same-line-condition
-  Enabled: false
-Layout/DotPosition:
-  Description: Checks the position of the dot in multi-line method calls.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains
-  EnforcedStyle: trailing
-Layout/ExtraSpacing:
-  Description: Do not use unnecessary spacing.
-  Enabled: true
-Layout/MultilineOperationIndentation:
-  Description: Checks indentation of binary operations that span more than one line.
-  Enabled: true
-  EnforcedStyle: indented
-Layout/MultilineMethodCallIndentation:
-  Description: Checks indentation of method calls with the dot operator that span
-    more than one line.
-  Enabled: true
-  EnforcedStyle: indented
-Layout/InitialIndentation:
-  Description: Checks the indentation of the first non-blank non-comment line in a
-    file.
-  Enabled: false
-Lint/AmbiguousOperator:
-  Description: Checks for ambiguous operators in the first argument of a method invocation
-    without parentheses.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#parens-as-args
-  Enabled: false
-Lint/AmbiguousRegexpLiteral:
-  Description: Checks for ambiguous regexp literals in the first argument of a method
-    invocation without parenthesis.
-  Enabled: false
-Lint/AssignmentInCondition:
-  Description: Don't use assignment in conditions.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#safe-assignment-in-condition
-  Enabled: false
-Lint/CircularArgumentReference:
-  Description: Don't refer to the keyword argument in the default value.
-  Enabled: false
-Lint/DeprecatedClassMethods:
-  Description: Check for deprecated class method calls.
-  Enabled: false
-Lint/DuplicatedKey:
-  Description: Check for duplicate keys in hash literals.
-  Enabled: false
-Lint/EachWithObjectArgument:
-  Description: Check for immutable argument given to each_with_object.
-  Enabled: false
-Lint/ElseLayout:
-  Description: Check for odd code arrangement in an else block.
-  Enabled: false
-Lint/FormatParameterMismatch:
-  Description: The number of parameters to format/sprint must match the fields.
-  Enabled: false
-Lint/HandleExceptions:
-  Description: Don't suppress exception.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
-  Enabled: false
-Lint/LiteralAsCondition:
-  Description: Checks of literals used in conditions.
-  Enabled: false
-Lint/LiteralInInterpolation:
-  Description: Checks for literals used in interpolation.
-  Enabled: false
-Lint/Loop:
-  Description: Use Kernel#loop with break rather than begin/end/until or begin/end/while
-    for post-loop tests.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#loop-with-break
-  Enabled: false
-Lint/NestedMethodDefinition:
-  Description: Do not use nested method definitions.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-methods
-  Enabled: false
-Lint/NonLocalExitFromIterator:
-  Description: Do not use return in iterator to cause non-local exit.
-  Enabled: false
-Lint/ParenthesesAsGroupedExpression:
-  Description: Checks for method calls with a space before the opening parenthesis.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#parens-no-spaces
-  Enabled: false
-Lint/RequireParentheses:
-  Description: Use parentheses in the method call to avoid confusion about precedence.
-  Enabled: false
-Lint/UnderscorePrefixedVariableName:
-  Description: Do not use prefix `_` for a variable that is used.
-  Enabled: false
-Lint/UnneededCopDisableDirective:
-  Description: 'Checks for rubocop:disable comments that can be removed. Note: this
-    cop is not disabled when disabling all cops. It must be explicitly disabled.'
-  Enabled: false
-Lint/Void:
-  Description: Possible use of operator/literal/variable in void context.
-  Enabled: false
-Performance/CaseWhenSplat:
-  Description: Place `when` conditions that use splat at the end of the list of `when`
-    branches.
-  Enabled: false
-Performance/Count:
-  Description: Use `count` instead of `select...size`, `reject...size`, `select...count`,
-    `reject...count`, `select...length`, and `reject...length`.
-  Enabled: false
-Performance/Detect:
-  Description: Use `detect` instead of `select.first`, `find_all.first`, `select.last`,
-    and `find_all.last`.
-  Reference: https://github.com/JuanitoFatas/fast-ruby#enumerabledetect-vs-enumerableselectfirst-code
-  Enabled: false
-Performance/FlatMap:
-  Description: Use `Enumerable#flat_map` instead of `Enumerable#map...Array#flatten(1)`
-    or `Enumberable#collect..Array#flatten(1)`
-  Reference: https://github.com/JuanitoFatas/fast-ruby#enumerablemaparrayflatten-vs-enumerableflat_map-code
-  Enabled: false
-Performance/ReverseEach:
-  Description: Use `reverse_each` instead of `reverse.each`.
-  Reference: https://github.com/JuanitoFatas/fast-ruby#enumerablereverseeach-vs-enumerablereverse_each-code
-  Enabled: false
-Performance/Sample:
-  Description: Use `sample` instead of `shuffle.first`, `shuffle.last`, and `shuffle[Fixnum]`.
-  Reference: https://github.com/JuanitoFatas/fast-ruby#arrayshufflefirst-vs-arraysample-code
-  Enabled: false
-Performance/Size:
-  Description: Use `size` instead of `count` for counting the number of elements in
-    `Array` and `Hash`.
-  Reference: https://github.com/JuanitoFatas/fast-ruby#arraycount-vs-arraysize-code
-  Enabled: false
-Performance/StringReplacement:
-  Description: Use `tr` instead of `gsub` when you are replacing the same number of
-    characters. Use `delete` instead of `gsub` when you are deleting characters.
-  Reference: https://github.com/JuanitoFatas/fast-ruby#stringgsub-vs-stringtr-code
-  Enabled: false
-Rails/ActionFilter:
-  Description: Enforces consistent use of action filter methods.
-  Enabled: false
-Rails/Date:
-  Description: Checks the correct usage of date aware methods, such as Date.today,
-    Date.current etc.
-  Enabled: false
-Rails/FindBy:
-  Description: Prefer find_by over where.first.
-  Enabled: false
-Rails/FindEach:
-  Description: Prefer all.find_each over all.find.
-  Enabled: false
-Rails/HasAndBelongsToMany:
-  Description: Prefer has_many :through to has_and_belongs_to_many.
-  Enabled: false
-Rails/Output:
-  Description: Checks for calls to puts, print, etc.
-  Enabled: false
-Rails/ReadWriteAttribute:
-  Description: Checks for read_attribute(:attr) and write_attribute(:attr, val).
-  Enabled: false
-Rails/ScopeArgs:
-  Description: Checks the arguments of ActiveRecord scopes.
-  Enabled: false
-Rails/TimeZone:
-  Description: Checks the correct usage of time zone aware methods.
-  StyleGuide: https://github.com/bbatsov/rails-style-guide#time
-  Reference: http://danilenko.org/2012/7/6/rails_timezones
-  Enabled: false
-Rails/Validation:
-  Description: Use validates :attribute, hash of validations.
-  Enabled: false
-Rails:
-  Enabled: true
-Metrics/PerceivedComplexity:
-  Description: A complexity metric geared towards measuring complexity for a human
-    reader.
-  Enabled: true
-  Max: 7

data/.yardopts

@@ -0,0 +1,11 @@
+# macro must be defined first, see https://stackoverflow.com/a/10344776/1823988
+lib/expressir/model/model_element.rb
+lib/expressir/model/data_type.rb
+lib/expressir/model/declaration.rb
+lib/expressir/model/expression.rb
+lib/expressir/model/literal.rb
+lib/expressir/model/reference.rb
+lib/expressir/model/statement.rb
+lib/expressir/model/supertype_expression.rb
+
+lib/**/*.rb

data/Rakefile

@@ -1,6 +1,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rake/extensiontask"
+require "yard"
 
 RSpec::Core::RakeTask.new(:spec)
 
@@ -9,3 +10,5 @@ task :default => :spec
 GEMSPEC = Gem::Specification.load("expressir.gemspec")
 
 Gem::PackageTask.new(GEMSPEC).define
+
+YARD::Rake::YardocTask.new

data/demo.rb

@@ -1,18 +1,18 @@
 #!/usr/bin/env ruby
 
 require 'expressir'
-require 'expressir/express_exp/parser'
+require 'expressir/express/parser'
 
 # This file is from:
 # https://github.com/metanorma/annotated-express/blob/master/data/resources/action_schema/action_schema.exp
 file = 'action_schema.exp'
 
-# repo = Expressir::ExpressExp::Parser.from_exp(file)
+# repo = Expressir::Express::Parser.from_exp(file)
 # schema = repo.schemas.find{|schema| schema.id == "support_resource_schema"}
 
-repo = Expressir::ExpressExp::Parser.from_exp(file)
+repo = Expressir::Express::Parser.from_exp(file)
 schema = repo.schemas.find{|schema| schema.id == "action_schema"}
 entity = schema.entities.find{|entity| entity.id == "action_directive_relationship"}
-where = entity.where.find{|where| where.id == "WR1"}
+where_rule = entity.where_rules.find{|where_rule| where_rule.id == "WR1"}
 
-puts where.inspect
+puts where_rule.inspect