mulang 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bb18e555a651ab4f2c24ac12c63c209e542c16f06568e64991f3805f6ade038
-  data.tar.gz: fe43d0621ccdd7de1fb4456a847500f18643fa7073283fc7383bfd686e56fe2c
+  metadata.gz: fd9e7b420eb8e3ca739405ca392944762b50d255a377f23742937d038178efea
+  data.tar.gz: 1eb585f9453b54f404a18f069cecd15107845f83060a0f9dca86b27a5b6df121
 SHA512:
-  metadata.gz: 54cb641d94595bb9bb7b7a90ca34b1d07c43d16f5e9f4cf1b4c8739e4caf4019a417c72d69dd3823bde6caa9d43b90a7e1214d1e2aa6a0f25010ace70413a4e1
-  data.tar.gz: e3cc1287c561622172627a476548b0c721a8b3395928e5f0a26eb9ec11a10fe2275839668145a7bc63390be34556fda0e7230ca01675c7bf5df469897fc112ec
+  metadata.gz: fcbcee4826c479c36c3467c5ce5847bb2eb8a877c4e0c659c7e0808b9c8267c8b753862726cc3e630c5d8bbc0b16d299c1aadef3d9922b79b87c0548c4d345a0
+  data.tar.gz: ee918b2941252550c2758f802c35ba4c66b9aa8c3a4fa09326a1182e2a65ca61a7fe054c122578b3ce7470a7cc9a04a778299f3040b6d9152cd8779fb6d3234d

data/lib/mulang/code.rb

@@ -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

@@ -19,13 +19,13 @@ module Mulang::Expectation
     OverridesEqualOrHashButNotBoth
     ReturnsNil
     ReturnsNull
+    DoesTypeTest
   )
 
   IMPERATIVE_SMELLS = %w(
     HasAssignmentCondition
     HasAssignmentReturn
     HasEmptyRepeat
-    HasRedundantLocalVariableReturn
     HasRedundantRepeat
   )
 
@@ -40,13 +40,13 @@ module Mulang::Expectation
   GENERIC_SMELLS = %w(
     DiscardsExceptions
     DoesConsolePrint
-    DoesTypeTest
     HasCodeDuplication
     HasDeclarationTypos
     HasEmptyIfBranches
     HasEqualIfBranches
     HasLongParameterList
     HasRedundantBooleanComparison
+    HasRedundantLocalVariableReturn
     HasRedundantIf
     HasRedundantLambda
     HasTooShortBindings
@@ -57,7 +57,17 @@ 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>>'

data/lib/mulang/language.rb

@@ -20,6 +20,14 @@ module Mulang::Language
       options.except(:serialization).presence
     end
 
+    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
+    end
+
     private
 
     def base_analysis(content, spec, **options)
@@ -36,41 +44,52 @@ module Mulang::Language
   end
 
   class Native < Base
-    def initialize(language)
-      @language = language
-    end
-
-    def ast(content, **options)
-      Mulang.analyse(ast_analysis(content, **options), **options)['outputAst'] rescue nil
-    end
+    attr_accessor :name
 
-    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
   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 base_analysis(*)
+      super.deep_merge(spec: {originalLanguage: @name}.compact)
+    end
+
+    private
+
+    def call_tool(content)
+      @tool.call(content) rescue nil
+    end
   end
 end

data/lib/mulang/version.rb

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

metadata

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