mulang 6.0.3 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 182d9dc0befc244e258aad82df8004b96c4cfbf4e3c61b2267fd8eca5cea24f5
-  data.tar.gz: 47e8caed69cf3e891b1b61edae11351d7c994153d3556676926117e9ae1f5efd
+  metadata.gz: c939a5ccbb3c37d4185d74b92716ec2edb749e749ba030957cf76cde4f4eca8a
+  data.tar.gz: d26a911d0af64e7909a3febc313609c3c4014d16f493135b095925accf8b5cae
 SHA512:
-  metadata.gz: 9ec56318e2bead4146346ae0841a0967b51aad104ff0f45ad4e315bc6c71dada1784ce70c2d4f3128ee2bf867994528a67665d2d40e7350322effd0551b8d6be
-  data.tar.gz: 5bded1ee77300941d9353b0ffef44b7d59d113a3d79e643a3b1278d3f5e4deb4a1787101e3026d8038489c5e208c75a09f130f657e69484ec7cd051df13e8d33
+  metadata.gz: 42d6d6a37862e5f72e052c45e21e1889614a27f16ee5b26e5a9155e1450fa0520b7ab29b31eee145b3a6848ea2127a1fe46ceead60d78dbcbfa94ca65b7fc84f
+  data.tar.gz: b982f347a29409ebcce08d54d20f766c152217c761fedb5b5229671731ca816f10c0816774d670511e08d152d2af94ae7039e04280c3641ac207c83a87a71691

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)

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,7 +27,7 @@ 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)
@@ -25,12 +39,10 @@ module Mulang::Language
     end
 
     def ast_analysis(content, **options)
-      base_analysis content, {includeOutputAst: true}, **options
+      build_analysis content, {includeOutputAst: true}, **options
     end
 
-    private
-
-    def base_analysis(content, spec, **options)
+    def build_analysis(content, spec, **options)
       {
         sample: sample(content),
         spec: {
@@ -57,6 +69,10 @@ module Mulang::Language
         content: content
       }
     end
+
+    def core_name
+      @name
+    end
   end
 
   class External < Base
@@ -82,8 +98,12 @@ module Mulang::Language
       }
     end
 
-    def base_analysis(*)
-      super.deep_merge(spec: {originalLanguage: @name}.compact)
+    def build_analysis(*)
+      super.deep_merge(spec: {originalLanguage: core_name}.compact)
+    end
+
+    def core_name
+      @name.in?(CORE_LANGUAGES) ? name : nil
     end
 
     private

data/lib/mulang/version.rb

@@ -1,4 +1,4 @@
 module Mulang
-  VERSION = "6.0.3"
-  MULANG_VERSION = "6.0.3"
+  VERSION = "6.0.4"
+  MULANG_VERSION = "6.0.4"
 end

metadata

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