Flatten the platform package

Author: chrisseaton

src/main/java/org/truffleruby/RubyContext.java

@@ -71,8 +71,8 @@
 import org.truffleruby.platform.Platform;
 import org.truffleruby.platform.NativeConfiguration;
 import org.truffleruby.platform.TruffleNFIPlatform;
-import org.truffleruby.platform.darwin.DarwinNativeConfiguration;
-import org.truffleruby.platform.linux.LinuxNativeConfiguration;
+import org.truffleruby.platform.DarwinNativeConfiguration;
+import org.truffleruby.platform.LinuxNativeConfiguration;
 import org.truffleruby.shared.TruffleRuby;
 import org.truffleruby.shared.options.RubyOptionTypes;
 import org.truffleruby.stdlib.CoverageManager;

src/main/java/org/truffleruby/parser/BodyTranslator.java

@@ -253,8 +253,6 @@
 import org.truffleruby.parser.parser.ParseNodeTuple;
 import org.truffleruby.parser.parser.ParserSupport;
 import org.truffleruby.parser.scope.StaticScope;
-import org.truffleruby.platform.graal.AssertConstantNodeGen;
-import org.truffleruby.platform.graal.AssertNotCompiledNodeGen;
 
 import com.oracle.truffle.api.RootCallTarget;
 import com.oracle.truffle.api.Truffle;
@@ -264,6 +262,8 @@
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.source.SourceSection;
+import org.truffleruby.platform.AssertConstantNodeGen;
+import org.truffleruby.platform.AssertNotCompiledNodeGen;
 
 /**
  * A JRuby parser node visitor which translates JRuby AST nodes into truffle Nodes.

src/main/java/org/truffleruby/platform/graal/AssertConstantNode.java renamed to src/main/java/org/truffleruby/platform/AssertConstantNode.java

@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.platform.graal;
+package org.truffleruby.platform;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;

src/main/java/org/truffleruby/platform/graal/AssertNotCompiledNode.java renamed to src/main/java/org/truffleruby/platform/AssertNotCompiledNode.java

@@ -7,7 +7,7 @@
  * GNU General Public License version 2, or
  * GNU Lesser General Public License version 2.1.
  */
-package org.truffleruby.platform.graal;
+package org.truffleruby.platform;
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;

src/main/java/org/truffleruby/platform/darwin/DarwinNativeConfiguration.java renamed to src/main/java/org/truffleruby/platform/DarwinNativeConfiguration.java

@@ -35,11 +35,9 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.truffleruby.platform.darwin;
+package org.truffleruby.platform;
 
 import org.truffleruby.RubyContext;
-import org.truffleruby.platform.DefaultNativeConfiguration;
-import org.truffleruby.platform.NativeConfiguration;
 
 public class DarwinNativeConfiguration extends DefaultNativeConfiguration {
 

src/main/java/org/truffleruby/platform/linux/LinuxNativeConfiguration.java renamed to src/main/java/org/truffleruby/platform/LinuxNativeConfiguration.java

@@ -35,11 +35,9 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-package org.truffleruby.platform.linux;
+package org.truffleruby.platform;
 
 import org.truffleruby.RubyContext;
-import org.truffleruby.platform.DefaultNativeConfiguration;
-import org.truffleruby.platform.NativeConfiguration;
 
 public class LinuxNativeConfiguration extends DefaultNativeConfiguration {
 

tool/generate-native-config.rb

@@ -43,10 +43,10 @@
 
 case RUBY_PLATFORM
 when /x86_64-linux/
-  PLATFORM_FILE = 'org/truffleruby/platform/linux/LinuxNativeConfiguration.java'
+  PLATFORM_FILE = 'org/truffleruby/platform/LinuxNativeConfiguration.java'
   EXTRA_CFLAGS << ' -D_GNU_SOURCE'
 when /x86_64-darwin/
-  PLATFORM_FILE = 'org/truffleruby/platform/darwin/DarwinNativeConfiguration.java'
+  PLATFORM_FILE = 'org/truffleruby/platform/DarwinNativeConfiguration.java'
 else
   raise "Unsupported platform #{RUBY_PLATFORM}"
 end