mulang 6.0.0 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bb18e555a651ab4f2c24ac12c63c209e542c16f06568e64991f3805f6ade038
-  data.tar.gz: fe43d0621ccdd7de1fb4456a847500f18643fa7073283fc7383bfd686e56fe2c
+  metadata.gz: 840be5bf9bea2b4855d162f1aa04249c43f6b03081715e3fd930eebf7ab25545
+  data.tar.gz: 5b6304cdd8c354fc8300064f8c2852f63556f39549157e6580ec904fea36b24f
 SHA512:
-  metadata.gz: 54cb641d94595bb9bb7b7a90ca34b1d07c43d16f5e9f4cf1b4c8739e4caf4019a417c72d69dd3823bde6caa9d43b90a7e1214d1e2aa6a0f25010ace70413a4e1
-  data.tar.gz: e3cc1287c561622172627a476548b0c721a8b3395928e5f0a26eb9ec11a10fe2275839668145a7bc63390be34556fda0e7230ca01675c7bf5df469897fc112ec
+  metadata.gz: d132b9c22e545e123f7badba82e9435f746a735d29346ae078f7c916f8d03968b0c3695e358931bab0d72255b2e4f3dd7f45211c5afe8b43826bbb590919e5b0
+  data.tar.gz: bc0a5da0bd4475e77b56d9daef6e2bf4f1af4f2250c9108c4203123669be1837177b9209e00809a6f50c7df70bc7d1f0d3c1fa2fe6fde8206e46b7adc5c2490a

data/lib/locales/en.yml

@@ -171,8 +171,8 @@ en:
       UsesComprehension: '%{binding} %{must} use comprehensions'
       UsesConditional: '%{binding} %{must} use conditionals'
       UsesCut: '%{binding} uses <code>!</li> operator, which is a bad practice'
-      UsesDyamicPolymorphism: '%{binding} %{must} use polymorphism'
       UsesDynamicMethodOverload: '%{binding} %{must} use overload'
+      UsesDynamicPolymorphism: '%{binding} %{must} use polymorphism'
       UsesFail: '%{binding} uses <code>%{keyword_Fail}</li>, which is a bad practice'
       UsesFindall: '%{binding} %{must} use <code>%{keyword_Findall}</code>'
       UsesForall: '%{binding} %{must} use <code>%{keyword_Forall}</code>'
@@ -185,6 +185,7 @@ en:
       UsesLoop: '%{binding} %{must} use a loop%{matching}'
       UsesMath: '%{binding} %{must} usar math expressions'
       UsesMixin: '%{binding} %{must} use mixins'
+      UsesNamedSelfReference: '%{binding} should use <code>%{keyword_Self}</code> instead of a global reference'
       UsesNot: '%{binding} %{must} use not'
       UsesObjectComposition: '%{binding} %{must} use composition'
       UsesPatternMatching: '%{binding} %{must} use pattern matching'

data/lib/locales/es.yml

@@ -183,8 +183,8 @@ es:
       UsesComprehension: '%{binding} %{must} emplear listas por comprensión'
       UsesConditional: '%{binding} %{must} utilizar condicionales'
       UsesCut: '%{binding} usa el operador !, lo cual es una mala práctica'
-      UsesDyamicPolymorphism: '%{binding} %{must} usar polimorfismo'
       UsesDynamicMethodOverload: '%{binding} %{must} usar sobrecarga'
+      UsesDynamicPolymorphism: '%{binding} %{must} usar polimorfismo'
       UsesExceptionHandling: '%{binding} %{must} realizar manejo de excepciones'
       UsesExceptions: '%{binding} %{must} usar excepciones'
       UsesFail: '%{binding} usa <code>%{keyword_Fail}</li>, lo cual es una mala práctica'
@@ -201,6 +201,7 @@ es:
       UsesMath: '%{binding} %{must} usar expresiones matemáticas'
       UsesMixin: '%{binding} %{must} utilizar mixins'
       UsesMixins: '%{binding} %{must} usar mixins'
+      UsesNamedSelfReference: '%{binding} debería usar <code>%{keyword_Self}</code> en lugar de una referencia global'
       UsesNot: '%{binding} %{must} utilizar <code>%{keyword_Not}</code>'
       UsesObjectComposition: '%{binding} %{must} usar composición'
       UsesPatternMatching: '%{binding} %{must} utilizar pattern matching'

data/lib/locales/pt.yml

@@ -145,7 +145,7 @@ pt:
       Instantiates_named: '%{binding} %{must} instantiate %{target}'
       Instantiates: '%{binding} %{must} instanciar objetos'
       IsLongCode: '%{binding}  é muito longo. Tente delegar mais'
-      JavaScript#UsesVarInsteadOfLet: '% {binding} deve usar <code>let</code> em vez de <code>var</code>'
+      JavaScript#UsesVarInsteadOfLet: '%{binding} deve usar <code>let</code> em vez de <code>var</code>'
       OverridesEqualOrHashButNotBoth: '%{binding} redefine os métodos <code>equals</code> ou <code>hash </code>, mas não ambos'
       Raises_except: '%{binding} %{must} lançar exceções diferentes de %{target}'
       Raises_like: '%{binding} %{must} lançar exceções semelhantes a %{target}'
@@ -175,8 +175,8 @@ pt:
       UsesComprehension: '%{binding} %{must} usar listas pelo entendimento'
       UsesConditional: '%{binding} %{must} usar conditional'
       UsesCut: '%{binding}  usa o operador !, que é uma má prática'
-      UsesDyamicPolymorphism: '%{binding} %{must} usar polimorfismo'
       UsesDynamicMethodOverload: '%{binding} %{must} usar sobrecarga'
+      UsesDynamicPolymorphism: '%{binding} %{must} usar polimorfismo'
       UsesExceptionHandling: '%{binding} %{must} executar o tratamento de exceção'
       UsesExceptions: '%{binding} %{must} usar exceções'
       UsesFail: '%{binding}  usa <code>%{keyword_Fail}</li>, o que é uma prática ruim'
@@ -192,6 +192,7 @@ pt:
       UsesLoop: '%{binding} %{must} usar um loop%{matching}'
       UsesMath: '%{binding} %{must} usar expressões matemáticas'
       UsesMixins: '%{binding} %{must} usar mixins'
+      UsesNamedSelfReference: '%{binding} deve usar <code>%{keyword_Self}</code> em vez de uma referência global'
       UsesNot: '%{binding} %{must} usar <code>%{keyword_Not}</code>'
       UsesObjectComposition: '%{binding} %{must} usar composição'
       UsesPatternMatching: '%{binding} %{must} usar o padrão de correspondência'

data/lib/mulang/code.rb

@@ -30,8 +30,8 @@ module Mulang
       @language.sample @content
     end
 
-    def analysis(spec)
-      { sample: sample, spec: spec }
+    def analysis(spec, **options)
+      @language.build_analysis @content, spec, **options
     end
 
     def analyse(spec, **options)
@@ -60,8 +60,8 @@ module Mulang
       native(*args).tap { |it| it.expect('Parses') }
     end
 
-    def self.external(content, &tool)
-      new Mulang::Language::External.new(&tool), content
+    def self.external(language_name = nil, content, &tool)
+      new Mulang::Language::External.new(language_name, &tool), content
     end
 
     def self.analyse_many(codes, spec, **options)
@@ -76,13 +76,13 @@ module Mulang
       run_many(codes, key: 'transformedAsts', **options) { |it| it.transformed_asts_analysis(operations, **options) }
     end
 
-    private
-
     def self.run_many(codes, key: nil, **options)
       result = Mulang.analyse(codes.map { |it| yield it }, **options)
       key ? result.map { |it| it[key] } : result
     end
 
+    private
+
     def expectation_results_for(result)
       raise result['reason'] if result['tag'] == 'AnalysisFailed'
       result['expectationResults']

data/lib/mulang/expectation.rb

@@ -8,6 +8,7 @@ module Mulang::Expectation
 
   FUNCTIONAL_SMELLS = %w(
     HasRedundantGuards
+    HasRedundantLambda
     HasRedundantParameter
     ShouldUseOtherwise
   )
@@ -15,23 +16,25 @@ module Mulang::Expectation
   OBJECT_ORIENTED_SMELLS = %w(
     DoesNilTest
     DoesNullTest
+    DoesTypeTest
     HasTooManyMethods
     OverridesEqualOrHashButNotBoth
     ReturnsNil
     ReturnsNull
+    UsesNamedSelfReference
   )
 
   IMPERATIVE_SMELLS = %w(
     HasAssignmentCondition
     HasAssignmentReturn
     HasEmptyRepeat
-    HasRedundantLocalVariableReturn
     HasRedundantRepeat
   )
 
   EXPRESSIVENESS_SMELLS = %w(
     HasMisspelledBindings
     HasMisspelledIdentifiers
+    HasTooShortBindings
     HasTooShortIdentifiers
     HasWrongCaseBinding
     HasWrongCaseIdentifiers
@@ -40,7 +43,6 @@ module Mulang::Expectation
   GENERIC_SMELLS = %w(
     DiscardsExceptions
     DoesConsolePrint
-    DoesTypeTest
     HasCodeDuplication
     HasDeclarationTypos
     HasEmptyIfBranches
@@ -48,8 +50,7 @@ module Mulang::Expectation
     HasLongParameterList
     HasRedundantBooleanComparison
     HasRedundantIf
-    HasRedundantLambda
-    HasTooShortBindings
+    HasRedundantLocalVariableReturn
     HasUnreachableCode
     HasUsageTypos
     IsLongCode
@@ -57,12 +58,22 @@ module Mulang::Expectation
     ShouldUseStrictComparators
   )
 
-  SMELLS = GENERIC_SMELLS + EXPRESSIVENESS_SMELLS +  IMPERATIVE_SMELLS + OBJECT_ORIENTED_SMELLS + FUNCTIONAL_SMELLS + LOGIC_SMELLS
+  JAVA_SCRIPT_SMELLS = %w(
+    JavaScript#UsesVarInsteadOfLet
+  )
+
+  SMELLS = GENERIC_SMELLS +
+           EXPRESSIVENESS_SMELLS +
+           IMPERATIVE_SMELLS +
+           OBJECT_ORIENTED_SMELLS +
+           FUNCTIONAL_SMELLS +
+           LOGIC_SMELLS +
+           JAVA_SCRIPT_SMELLS
 
   def self.guess_type(expectation)
     if expectation[:binding] == '<<custom>>'
       Custom
-    elsif expectation[:inspection] =~ /(Not\:)?Has.*/ && !has_smell?(expectation[:inspection])
+    elsif expectation[:inspection] =~ /^(Not\:)?Has.*/ && !has_smell?(expectation[:inspection])
       V0
     else
       V2

data/lib/mulang/language.rb

@@ -1,11 +1,25 @@
 module Mulang::Language
+  CORE_LANGUAGES = %w(
+    Java
+    JavaScript
+    Prolog
+    Haskell
+    Python
+    Python2
+    Python3
+    Ruby
+    Php
+    C
+    Mulang
+  )
+
   class Base
     def identifiers(content, **options)
       Mulang.analyse(identifiers_analysis(content, **options), **options)['outputIdentifiers'] rescue nil
     end
 
     def identifiers_analysis(content, **options)
-      base_analysis content, {includeOutputIdentifiers: true}, **options
+      build_analysis content, {includeOutputIdentifiers: true}, **options
     end
 
     def transformed_asts(content, operations, **options)
@@ -13,16 +27,22 @@ module Mulang::Language
     end
 
     def transformed_asts_analysis(content, operations, **options)
-      base_analysis content, {transformationSpecs: operations}, **options
+      build_analysis content, {transformationSpecs: operations}, **options
     end
 
     def normalization_options(**options)
       options.except(:serialization).presence
     end
 
-    private
+    def ast(content, **options)
+      Mulang.analyse(ast_analysis(content, **options), **options)['outputAst'] rescue nil
+    end
+
+    def ast_analysis(content, **options)
+      build_analysis content, {includeOutputAst: true}, **options
+    end
 
-    def base_analysis(content, spec, **options)
+    def build_analysis(content, spec, **options)
       {
         sample: sample(content),
         spec: {
@@ -36,41 +56,60 @@ module Mulang::Language
   end
 
   class Native < Base
-    def initialize(language)
-      @language = language
-    end
+    attr_accessor :name
 
-    def ast(content, **options)
-      Mulang.analyse(ast_analysis(content, **options), **options)['outputAst'] rescue nil
-    end
-
-    def ast_analysis(content, **options)
-      base_analysis content, {includeOutputAst: true}, **options
+    def initialize(language_name)
+      @name = language_name
     end
 
     def sample(content)
       {
         tag: 'CodeSample',
-        language: @language,
+        language: @name,
         content: content
       }
     end
+
+    def core_name
+      @name
+    end
   end
 
   class External < Base
-    def initialize(&tool)
+    attr_accessor :name
+
+    def initialize(language_name = nil, &tool)
+      @name = language_name
       @tool = block_given? ? tool : proc { |it| it }
     end
 
     def ast(content, **args)
-      @tool.call(content) rescue nil
+      if args[:serialization]
+        super
+      else
+        call_tool content
+      end
     end
 
     def sample(content)
       {
         tag: 'MulangSample',
-        ast: ast(content)
+        ast: call_tool(content)
       }
     end
+
+    def build_analysis(*)
+      super.deep_merge(spec: {originalLanguage: core_name}.compact)
+    end
+
+    def core_name
+      @name.in?(CORE_LANGUAGES) ? name : nil
+    end
+
+    private
+
+    def call_tool(content)
+      @tool.call(content) rescue nil
+    end
   end
 end

data/lib/mulang/tokens.rb

@@ -92,6 +92,7 @@ module Mulang
         keyword_ForEach: 'for',
         keyword_Interface: 'interface',
         keyword_Switch: 'switch',
+        keyword_Self: 'this',
         operator_And: '&&',
         operator_Divide: '/',
         operator_Equal: 'equal',
@@ -123,6 +124,7 @@ module Mulang
         keyword_If: 'if',
         keyword_Return: 'return',
         keyword_While: 'while',
+        keyword_Self: 'this',
         operator_And: '&&',
         operator_Divide: '/',
         operator_Equal: '===',
@@ -155,6 +157,7 @@ module Mulang
         keyword_If: 'if',
         keyword_Return: 'return',
         keyword_While: 'while',
+        keyword_Self: 'self',
         operator_And: 'and',
         operator_Divide: '/',
         operator_Equal: '==',
@@ -188,6 +191,7 @@ module Mulang
         keyword_ForEach: 'for',
         keyword_Include: 'include',
         keyword_Switch: 'case',
+        keyword_Self: 'self',
         operator_And: '&&',
         operator_Divide: '/',
         operator_Equal: '==',
@@ -207,6 +211,7 @@ module Mulang
         operator_BitwiseXor: '^',
         operator_BitwiseLeftShift: '<<',
         operator_BitwiseRightShift: '>>',
+        operator_Size: 'length',
         operator_Hash: 'hash',
         operator_ForwardComposition: '>>',
         operator_BackwardComposition: '<<'
@@ -219,6 +224,7 @@ module Mulang
         keyword_If: 'if',
         keyword_Return: 'return',
         keyword_While: 'while',
+        keyword_Self: 'this',
         operator_And: '&&',
         operator_Divide: '/',
         operator_Equal: '==',

data/lib/mulang/version.rb

@@ -1,4 +1,4 @@
 module Mulang
-  VERSION = "6.0.0"
-  MULANG_VERSION = "6.0.0"
+  VERSION = "6.0.5"
+  MULANG_VERSION = "6.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mulang
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.5
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit-core