From owner-svn-src-head@freebsd.org Wed Feb 21 21:39:48 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0C681F02B87; Wed, 21 Feb 2018 21:39:48 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AC84A748E0; Wed, 21 Feb 2018 21:39:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A73CC1E0C3; Wed, 21 Feb 2018 21:39:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1LLdldk021933; Wed, 21 Feb 2018 21:39:47 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1LLdlLF021931; Wed, 21 Feb 2018 21:39:47 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201802212139.w1LLdlLF021931@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Wed, 21 Feb 2018 21:39:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r329756 - in head/stand: liblua lua X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/stand: liblua lua X-SVN-Commit-Revision: 329756 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Feb 2018 21:39:48 -0000 Author: kevans Date: Wed Feb 21 21:39:47 2018 New Revision: 329756 URL: https://svnweb.freebsd.org/changeset/base/329756 Log: lualoader: Remove nasty hack for not printing out ".0" luaconf.h has a LUA_COMPAT_FLOATSTRING option that may be defined to do this instead of needing intstring. Reported by: Dan Nelson Modified: head/stand/liblua/luaconf.h head/stand/lua/screen.lua Modified: head/stand/liblua/luaconf.h ============================================================================== --- head/stand/liblua/luaconf.h Wed Feb 21 21:18:04 2018 (r329755) +++ head/stand/liblua/luaconf.h Wed Feb 21 21:39:47 2018 (r329756) @@ -405,6 +405,7 @@ ** because this is not really an incompatibility. */ /* #define LUA_COMPAT_FLOATSTRING */ +#define LUA_COMPAT_FLOATSTRING /* }================================================================== */ Modified: head/stand/lua/screen.lua ============================================================================== --- head/stand/lua/screen.lua Wed Feb 21 21:18:04 2018 (r329755) +++ head/stand/lua/screen.lua Wed Feb 21 21:39:47 2018 (r329756) @@ -31,17 +31,6 @@ local core = require("core") local screen = {} --- XXX TODO: This should be fixed in the interpreter to not print decimals -local intstring = function(num) - local str = tostring(num) - local decimal = str:find("%.") - - if decimal then - return str:sub(1, decimal - 1) - end - return str -end - -- Module exports function screen.clear() if core.isSerialBoot() then @@ -55,7 +44,7 @@ function screen.setcursor(x, y) return end - loader.printc("\027[" .. intstring(y) .. ";" .. intstring(x) .. "H") + loader.printc("\027[" .. y .. ";" .. x .. "H") end function screen.setforeground(c)